Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
snf-image-creator
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
itminedu
snf-image-creator
Commits
9dc14cdd
Commit
9dc14cdd
authored
8 years ago
by
Nikos Skalkotos
Browse files
Options
Downloads
Patches
Plain Diff
Support host bundling in XEN Domains
Fix the root device check to support /dev/xvda[1-9] devices This fixes #52
parent
1b36a3e9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
image_creator/bundle_volume.py
+2
-2
2 additions, 2 deletions
image_creator/bundle_volume.py
with
2 additions
and
2 deletions
image_creator/bundle_volume.py
+
2
−
2
View file @
9dc14cdd
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
#
#
# Copyright (C) 2011-201
5
GRNET S.A.
# Copyright (C) 2011-201
6
GRNET S.A.
#
#
# This program is free software: you can redistribute it and/or modify
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the GNU General Public License as published by
...
@@ -219,7 +219,7 @@ class BundleVolume(object):
...
@@ -219,7 +219,7 @@ class BundleVolume(object):
if
root
.
startswith
(
"
UUID=
"
)
or
root
.
startswith
(
"
LABEL=
"
):
if
root
.
startswith
(
"
UUID=
"
)
or
root
.
startswith
(
"
LABEL=
"
):
root
=
findfs
(
root
).
stdout
.
strip
()
root
=
findfs
(
root
).
stdout
.
strip
()
if
not
re
.
match
(
'
/dev/[hsv]d[a-z][1-9]*$
'
,
root
):
if
not
re
.
match
(
'
/dev/
x?
[hsv]d[a-z][1-9]*$
'
,
root
):
raise
FatalError
(
"
Don
'
t know how to handle root device: %s
"
%
root
)
raise
FatalError
(
"
Don
'
t know how to handle root device: %s
"
%
root
)
out
.
success
(
root
)
out
.
success
(
root
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment