Run qemu only when --qemu option is present

The default behavior does not change - see next commit.

diff --git a/README.md b/README.md
index 6c3874b319dbaabaab1bb9b7913f523045df0be1..b48d307d41c5057a5f7749d327848e41db076959 100644 (file)
--- a/README.md
+++ b/README.md
@@ -323,9 +323,10 @@ to a particular location, e.g. to a TFTP boot server or to the
     Switch on/off the target machine. Currently works only with
     __\--iprelay__.
 
-- \-Q, --qemu=_qemu-binary_
+- \-Q, --qemu\[=_qemu-binary_\]
 
-    The name of qemu binary to use. The default is 'qemu'.
+    Boot the configuration in qemu. Optionally, the name of qemu binary
+    can be specified as a parameter.
 
 - \--qemu-append=_flags_
 

diff --git a/novaboot b/novaboot
index eb53207690e2457edb7610f37144d6c7af213c48..9ad5380fbe14cfc613031101c3b5d464461acc2c 100755 (executable)
--- a/novaboot
+++ b/novaboot
@@ -125,7 +125,7 @@ my %opt_spec;
     "on"            => \$on_opt,
     "pulsar|p:s"     => \$pulsar,
     "pulsar-root=s"  => \$pulsar_root,
-    "qemu|Q=s"              => \$qemu,
+    "qemu|Q:s"              => \$qemu,
     "qemu-append=s"  => \$qemu_append,
     "qemu-flags|q=s" => \$qemu_flags_cmd,
     "remote-cmd=s"   => \$remote_cmd,
@@ -612,7 +612,7 @@ sub trim($) {
 
 ### Qemu
 
-if (!(defined $dhcp_tftp || defined $serial || defined $iprelay || defined $server || defined $iso_image)) {
+if (defined $qemu) {
     # Qemu
     $qemu ||= $variables->{QEMU} || $CFG::qemu;
     my @qemu_flags = split(" ", $qemu);
@@ -1132,9 +1132,10 @@ copying files as a result of I<--server> option.
 Switch on/off the target machine. Currently works only with
 B<--iprelay>.
 
-=item -Q, --qemu=I<qemu-binary>
+=item -Q, --qemu[=I<qemu-binary>]
 
-The name of qemu binary to use. The default is 'qemu'.
+Boot the configuration in qemu. Optionally, the name of qemu binary
+can be specified as a parameter.
 
 =item --qemu-append=I<flags>