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

cloud-init: don't add cloudinit isos as 'unused'

Browse Source 
They're regenerated anyway as needed.
This commit is contained in:
Wolfgang Bumiller 2016-04-04 10:04:10 +02:00
parent 9c52f5edb6
commit 2d9ddec5af
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/QemuServer.pm
View File

@ -2057,7 +2057,10 @@ sub vmconfig_undelete_pending_option {
sub vmconfig_register_unused_drive { sub vmconfig_register_unused_drive {
my ($storecfg, $vmid, $conf, $drive) = @_; my ($storecfg, $vmid, $conf, $drive) = @_;
if (!drive_is_cdrom($drive, 1)) { if (drive_is_cloudinit($drive)) {
eval { PVE::Storage::vdisk_free($storecfg, $drive->{file}) };
warn $@ if $@;
} elsif (!drive_is_cdrom($drive)) {
my $volid = $drive->{file}; my $volid = $drive->{file};
if (vm_is_volid_owner($storecfg, $vmid, $volid)) { if (vm_is_volid_owner($storecfg, $vmid, $volid)) {
PVE::QemuConfig->add_unused_volume($conf, $volid, $vmid); PVE::QemuConfig->add_unused_volume($conf, $volid, $vmid);
@ -4679,6 +4682,9 @@ sub vmconfig_update_disk {
if ($drive->{file} eq 'none') { if ($drive->{file} eq 'none') {
vm_mon_cmd($vmid, "eject",force => JSON::true,device => "drive-$opt"); vm_mon_cmd($vmid, "eject",force => JSON::true,device => "drive-$opt");
if (drive_is_cloudinit($old_drive)) {
vmconfig_register_unused_drive($storecfg, $vmid, $conf, $old_drive);
}
} else { } else {
my $path = get_iso_path($storecfg, $vmid, $drive->{file}); my $path = get_iso_path($storecfg, $vmid, $drive->{file});
vm_mon_cmd($vmid, "eject", force => JSON::true,device => "drive-$opt"); # force eject if locked vm_mon_cmd($vmid, "eject", force => JSON::true,device => "drive-$opt"); # force eject if locked