From 0888fdce30ffeac1f2610ea95391f1e1100cb4aa Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 8 Dec 2011 11:41:58 +0100
Subject: [PATCH] fix bootorder

---
 PVE/QemuServer.pm | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 508f5d2d..556bb036 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2025,20 +2025,12 @@ sub config_to_command {
 
     my $bootorder = $conf->{boot} || $confdesc->{boot}->{default};
 
-    my $bootindex_hash = {
-	c => 100,
-	a => 200,
-	d => 300,
-    };
-
-    if ($bootorder) {
-	$bootindex_hash = {};
-	my $i = 1;
-	foreach my $o (split(//, $bootorder)) {
-	    $bootindex_hash->{$o} = $i*100;
-	    $i++;
-	} 
-    }
+    my $bootindex_hash = {};
+    my $i = 1;
+    foreach my $o (split(//, $bootorder)) {
+	$bootindex_hash->{$o} = $i*100;
+	$i++;
+    } 
 
     push @$cmd, '-boot', "menu=on";
 
@@ -2184,8 +2176,7 @@ sub config_to_command {
 
 	    # 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=," : '';
+	    my $extra = ($bootorder !~ m/n/) ? "romfile=," : '';
 	    $pciaddr = print_pci_addr("${k}");
 	    my $tmpstr = "$device,${extra}mac=$net->{macaddr},netdev=${k}$pciaddr";
 	    if (my $bootindex = $bootindex_hash->{n}) {