fix bootdisk_size for new bootorder config scheme

Previously, we ever only had a single boot *disk*, while possibly
having multiple cdroms/nics in the boot order

e.g. the config:

 boot: dnc
 bootdisk: scsi0
 ide0: media=cdrom,none
 scsi0: xxx
 net0: ...

would return the size of scsi0 even though it would first boot
from cdrom/network.

When editing the bootorder with such a legacy config, we
remove the 'bootdisk' property and replace the legacy notation
with an explicit order, but we only search the first disk
for the size now.

Restore that behaviour by iterating over all disks in the boot
order property string until we get one that is not a cdrom
and has a size.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm
index 0d66b2ecd9d5a2f1d075468d55bdc1f7ecc487dc..146a4ab17dddbf92420241cd29ab35d96c1ec1d2 100644 (file)
--- a/PVE/QemuServer/Drive.pm
+++ b/PVE/QemuServer/Drive.pm
@@ -531,20 +531,18 @@ sub bootdisk_size {
 
     my $bootdisks = get_bootdisks($conf);
     return if !@$bootdisks;
-    my $bootdisk = $bootdisks->[0];
-    return if !is_valid_drivename($bootdisk);
-
-    return if !$conf->{$bootdisk};
-
-    my $drive = parse_drive($bootdisk, $conf->{$bootdisk});
-    return if !defined($drive);
-
-    return if drive_is_cdrom($drive);
-
-    my $volid = $drive->{file};
-    return if !$volid;
+    for my $bootdisk (@$bootdisks) {
+       next if !is_valid_drivename($bootdisk);
+       next if !$conf->{$bootdisk};
+       my $drive = parse_drive($bootdisk, $conf->{$bootdisk});
+       next if !defined($drive);
+       next if drive_is_cdrom($drive);
+       my $volid = $drive->{file};
+       next if !$volid;
+       return $drive->{size};
+    }
 
-    return $drive->{size};
+    return;
 }
 
 sub update_disksize {