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

fix #2217: don't copy cloudinit disk on clone

Browse Source 
This removes the cloudinit disk from the list of drives to clone. As the
cloudinit disk is recreated on every VM start, it's not necessary to
clone it.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
This commit is contained in:
Mira Limbeck 2019-09-25 18:12:17 +02:00 committed by Thomas Lamprecht
parent f1619a3b42
commit 7d6c99f0a0
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/API2/Qemu.pm
View File

@ -2840,10 +2840,10 @@ __PACKAGE__->register_method({
} elsif (PVE::QemuServer::is_valid_drivename($opt)) {
my $drive = PVE::QemuServer::parse_drive($opt, $value);
die "unable to parse drive options for '$opt'\n" if !$drive;
if (PVE::QemuServer::drive_is_cdrom($drive, 1)) {
if (PVE::QemuServer::drive_is_cdrom($drive)) {
$newconf->{$opt} = $value; # simply copy configuration
} else {
if ($full || PVE::QemuServer::drive_is_cloudinit($drive)) {
if ($full) {
die "Full clone feature is not supported for drive '$opt'\n"
if !PVE::Storage::volume_has_feature($storecfg, 'copy', $drive->{file}, $snapname, $running);
$fullclone->{$opt} = 1;

8
PVE/QemuServer.pm
View File

@ -7152,14 +7152,6 @@ sub clone_disk {
print "create full clone of drive $drivename ($drive->{file})\n";
my $name = undef;
if (drive_is_cloudinit($drive)) {
$name = "vm-$newvmid-cloudinit";
$snapname = undef;
# we only get here if it's supported by QEMU_FORMAT_RE, so just accept
if ($dst_format ne 'raw') {
$name .= ".$dst_format";
}
}
$newvolid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $newvmid, $dst_format, $name, ($size/1024));
push @$newvollist, $newvolid;