From 17c5d2208328319198a059e225fc3f2bd937b585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 25 Nov 2013 17:15:15 +0100 Subject: [PATCH] qvm-tools: fix qvm-create --hvm* --root args parsing --- qvm-tools/qvm-create | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qvm-tools/qvm-create b/qvm-tools/qvm-create index d14eec37..bfed6e2b 100755 --- a/qvm-tools/qvm-create +++ b/qvm-tools/qvm-create @@ -89,6 +89,12 @@ def main(): exit (1) 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: print >> sys.stderr, "root.img can be specified only for standalone VMs" exit (1) @@ -97,11 +103,7 @@ def main(): print >> sys.stderr, "Template VM cannot be based on another template" 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): print >> sys.stderr, "File specified as root.img does not exists"