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

cloudinit: remove pending delete on online regenerate image

Browse Source 
currently only pending changes are applied when we regenerate
image on a running vm, but not the pending delete.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2021-02-06 14:39:54 +01:00 committed by Thomas Lamprecht
parent 545eec65cd
commit e6ec384fa7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/QemuServer.pm
View File

@ -4462,6 +4462,13 @@ sub vmconfig_hotplug_pending {
$conf->{$opt} = delete $conf->{pending}->{$opt}; $conf->{$opt} = delete $conf->{pending}->{$opt};
} }
my $pending_delete_hash = PVE::QemuConfig->parse_pending_delete($conf->{pending}->{delete});
foreach my $opt (sort keys %$pending_delete_hash) {
next if !grep { $_ eq $opt } @cloudinit_opts;
PVE::QemuConfig->remove_from_pending_delete($conf, $opt);
delete $conf->{$opt};
}
my $new_conf = { %$conf }; my $new_conf = { %$conf };
$new_conf->{$key} = $value; $new_conf->{$key} = $value;
PVE::QemuServer::Cloudinit::generate_cloudinitconfig($new_conf, $vmid); PVE::QemuServer::Cloudinit::generate_cloudinitconfig($new_conf, $vmid);