fix lxc config key in get_start_stop_list sub

When adding the new LXC config format we forgot to adapt the
get_start_stop_list and do s/pve.startup/onboot/

This fixes that qemu VMs were started always before LXC CTs,
irregardless of the defined order.

This also let's us simplify the surrounding code and reduce code
reuse.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 4f708e778b56453cc014035a8fadebe4135f8936..8a8a7c1bea6cf48ce7e7a7df2c0717f5ae3cb13a 100644 (file)
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -1145,30 +1145,24 @@ my $get_start_stop_list = sub {
            
            my $bootorder = LONG_MAX;
 
+           my $conf;
            if ($d->{type} eq 'lxc') {
-               my $conf = PVE::LXC::load_config($vmid); 
-               return if $autostart && !$conf->{'onboot'};
-               
-               if ($conf->{'pve.startup'}) {
-                   $startup = PVE::JSONSchema::pve_parse_startup_order($conf->{'startup'});
-                   $startup->{order} = $bootorder if !defined($startup->{order});
-               } else {
-                   $startup = { order => $bootorder };
-               }
+               $conf = PVE::LXC::load_config($vmid);
            } elsif ($d->{type} eq 'qemu') {
-               my $conf = PVE::QemuServer::load_config($vmid);
-               return if $autostart && !$conf->{onboot};
-
-               if ($conf->{startup}) {
-                   $startup =  PVE::JSONSchema::pve_parse_startup_order($conf->{startup});
-                   $startup->{order} = $bootorder if !defined($startup->{order});
-               } else {
-                   $startup = { order => $bootorder };
-               }
+               $conf = PVE::QemuServer::load_config($vmid);
            } else {
                die "unknown VM type '$d->{type}'\n";
            }
 
+           return if $autostart && !$conf->{onboot};
+
+           if ($conf->{startup}) {
+               $startup =  PVE::JSONSchema::pve_parse_startup_order($conf->{startup});
+               $startup->{order} = $bootorder if !defined($startup->{order});
+           } else {
+               $startup = { order => $bootorder };
+           }
+
            # skip ha managed VMs (started by pve-ha-manager)
            return if defined($haconf->{ids}->{"pvevm:$vmid"});