[pve-devel] r6464 - in qemu-server/pve2: . PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-12 08:58:22 +0200 (Fri, 12 Aug 2011)
New Revision: 6464

Modified:
   qemu-server/pve2/ChangeLog
   qemu-server/pve2/PVE/QemuServer.pm
Log:
	* PVE/QemuServer.pm (config_to_command): fix for 0.15.0 - supress
	network boot



Modified: qemu-server/pve2/ChangeLog
===================================================================
--- qemu-server/pve2/ChangeLog	2011-08-12 06:45:23 UTC (rev 6463)
+++ qemu-server/pve2/ChangeLog	2011-08-12 06:58:22 UTC (rev 6464)
@@ -1,3 +1,8 @@
+2011-08-12  Proxmox Support Team  <support at proxmox.com>
+
+	* PVE/QemuServer.pm (config_to_command): fix for 0.15.0 - supress
+	network boot
+
 2011-08-04  Proxmox Support Team  <support at proxmox.com>
 
 	* PVE/QemuServer.pm (config_list): use PVE::Cluster::get_vmlist()

Modified: qemu-server/pve2/PVE/QemuServer.pm
===================================================================
--- qemu-server/pve2/PVE/QemuServer.pm	2011-08-12 06:45:23 UTC (rev 6463)
+++ qemu-server/pve2/PVE/QemuServer.pm	2011-08-12 06:58:22 UTC (rev 6464)
@@ -2000,7 +2000,11 @@
 		push @$cmd, '-netdev', "type=user,id=${k},hostname=$vmname";
 	    }
 
-	    push @$cmd, '-device', "$device,mac=$net->{macaddr},netdev=${k}";
+	    # qemu > 0.15 always try to boot from network - we disable that by
+	    # not loading the pxe rom file
+	    my $extra = (!$conf->{boot} || ($conf->{boot} !~ m/n/)) ?
+		"romfile=," : '';
+	    push @$cmd, '-device', "$device,${extra}mac=$net->{macaddr},netdev=${k}";
 	}
     }