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

Use array to run_command instead of a string.

Browse Source
This commit is contained in:
Wolfgang Link
2016-03-16 14:24:36 +01:00
committed by Dietmar Maurer
parent 2d22db9a99
commit b650f029d3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/Storage.pm
View File

@ -510,18 +510,19 @@ sub storage_migrate {
my $zfspath = "$scfg->{pool}\/$volname"; my $zfspath = "$scfg->{pool}\/$volname";
my $snap = "zfs snapshot $zfspath\@__migration__"; my $snap = ['zfs', 'snapshot', "$zfspath\@__migration__"];
my $send = "zfs send -Rpv $zfspath\@__migration__ \| ssh root\@$target_host zfs recv $zfspath"; my $send = [['zfs', 'send', '-Rpv', "$zfspath\@__migration__"], ['ssh', "root\@$target_host",
'zfs', 'recv', $zfspath]];
my $destroy_target = "ssh root\@$target_host zfs destroy $zfspath\@__migration__"; my $destroy_target = ['ssh', "root\@$target_host", 'zfs', 'destroy', "$zfspath\@__migration__"];
run_command($snap); run_command($snap);
eval{ eval{
run_command($send); run_command($send);
}; };
my $err; my $err;
if ($err = $@){ if ($err = $@){
run_command("zfs destroy $zfspath\@__migration__"); run_command(['zfs', 'destroy', "$zfspath\@__migration__"]);
die $err; die $err;
} }
run_command($destroy_target); run_command($destroy_target);