yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change var name to prevent side effects.

Browse Source 
Signed-off-by: Wolfgang Link <w.link@proxmox.com>
This commit is contained in:
Wolfgang Link
2015-02-16 10:14:50 +01:00
committed by Dietmar Maurer
parent 4eff810db8
commit 82e08809fd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -179,16 +179,18 @@ sub alloc_image {
die "illegal name '$name' - sould be 'vm-$vmid-*'\n" die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
if $name && $name !~ m/^vm-$vmid-/; if $name && $name !~ m/^vm-$vmid-/;
$name = $class->zfs_find_free_diskname($storeid, $scfg, $vmid) if !$name; my $volname = $name;
$class->zfs_create_zvol($scfg, $name, $size); $volname = $class->zfs_find_free_diskname($storeid, $scfg, $vmid) if !$volname;
my $devname = "/dev/zvol/$scfg->{pool}/$name"; $class->zfs_create_zvol($scfg, $volname, $size);
my $devname = "/dev/zvol/$scfg->{pool}/$volname";
run_command("udevadm trigger --subsystem-match block"); run_command("udevadm trigger --subsystem-match block");
system("udevadm settle --timeout 10 --exit-if-exists=${devname}"); system("udevadm settle --timeout 10 --exit-if-exists=${devname}");
return $name; return $volname;
} }
sub free_image { sub free_image {