proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-29 07:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bootorder: don't print empty 'order=' property

Browse Source 
Specifying 'boot: order=' was intended to be used for an empty bootorder
(i.e. no boot devices), but as it turns out our format parser doesn't
like empty '-list' properties if they are nested in a subformat.

Fixing this in JSONSchema sounds like a risky move, so instead just
write 'boot: ' (without 'order=') to indicate an empty bootorder. The
rest of the code handles it just fine, as this was valid before too.

Incidentally also fixes a bug where you couldn't create a new VM without
any disks if no explicit 'boot' property was specified (i.e. a simple
'qm create 100' without any parameters would fail).

Reported-by: Dominic Jäger <d.jaeger@proxmox.com>
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-10-21 11:00:25 +02:00 committed by Thomas Lamprecht
parent 75127d1996
commit 4c27b18c08
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PVE/QemuServer.pm
View File

@ -1148,6 +1148,7 @@ sub verify_bootdev {
sub print_bootorder { sub print_bootorder {
my ($devs) = @_; my ($devs) = @_;
return "" if !@$devs;
my $data = { order => join(';', @$devs) }; my $data = { order => join(';', @$devs) };
return PVE::JSONSchema::print_property_string($data, $boot_fmt); return PVE::JSONSchema::print_property_string($data, $boot_fmt);
} }