Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-tools: fix qvm-create --hvm* --root args parsing

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-25 17:15:15 +01:00
parent 919b9455f8
commit 17c5d22083
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qvm-tools/qvm-create
View File

@ -89,6 +89,12 @@ def main():
exit (1) exit (1)
label = QubesVmLabels[options.label] label = QubesVmLabels[options.label]
if options.hvm and not options.template:
options.standalone = True
if options.hvm_template:
options.standalone = True
if not options.standalone and options.root is not None: if not options.standalone and options.root is not None:
print >> sys.stderr, "root.img can be specified only for standalone VMs" print >> sys.stderr, "root.img can be specified only for standalone VMs"
exit (1) exit (1)
@ -97,11 +103,7 @@ def main():
print >> sys.stderr, "Template VM cannot be based on another template" print >> sys.stderr, "Template VM cannot be based on another template"
exit (1) exit (1)
if options.hvm and not options.template:
options.standalone = True
if options.hvm_template:
options.standalone = True
if options.root is not None and not os.path.exists(options.root): if options.root is not None and not os.path.exists(options.root):
print >> sys.stderr, "File specified as root.img does not exists" print >> sys.stderr, "File specified as root.img does not exists"