Upstream proxmox-git/qemu-server state of the touched files before 6f34dddd1c
This commit is contained in:
1 parent
23657b8b24
commit
2b5f393932
1 file changed
+7
-7
@@ -412,15 +412,15 @@ sub scan_local_volumes {
|
||||
}
|
||||
|
||||
my $snaprefs = $attr->{referenced_in_snapshot};
|
||||
my $snapshot_hint = '';
|
||||
if (defined($snaprefs) && !$attr->{is_attached}) {
|
||||
my $snapnames = join(', ', sort keys %$snaprefs);
|
||||
$snapshot_hint = " (referenced in snapshot - $snapnames)";
|
||||
}
|
||||
|
||||
if ($attr->{cdrom}) {
|
||||
if ($volid eq 'cdrom') {
|
||||
&$log_error("can't migrate local cdrom drive$snapshot_hint\n");
|
||||
my $msg = "can't migrate local cdrom drive";
|
||||
if (defined($snaprefs) && !$attr->{is_attached}) {
|
||||
my $snapnames = join(', ', sort keys %$snaprefs);
|
||||
$msg .= " (referenced in snapshot - $snapnames)";
|
||||
}
|
||||
&$log_error("$msg\n");
|
||||
return;
|
||||
}
|
||||
return if $volid eq 'none';
|
||||
@@ -475,7 +475,7 @@ sub scan_local_volumes {
|
||||
$local_volumes->{$volid}->{ref} = 'generated';
|
||||
return;
|
||||
}
|
||||
die "local cdrom image$snapshot_hint\n";
|
||||
die "local cdrom image\n";
|
||||
}
|
||||
|
||||
my ($path, $owner) = PVE::Storage::path($storecfg, $volid);
|
||||
|
||||
Reference in new issue
Block a user