cyteen
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr767' into pr-merger

This commit is contained in:
Christoph Klaffl 2023-03-20 21:14:29 +01:00
parent c2f5367d3d 4f150ec6ec
commit b488611ae7
No known key found for this signature in database
GPG Key ID: 8FC1D76EED4970D2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syncoid
View File

@ -1536,6 +1536,8 @@ sub getsnaps() {
my $fsescaped = escapeshellparam($fs);
if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; }
my $rhostOriginal = $rhost;
if ($rhost ne '') {
$rhost = "$sshcmd $rhost";
# double escaping needed
@ -1553,7 +1555,7 @@ sub getsnaps() {
my @rawsnaps = <FH>;
close FH or do {
# fallback (solaris for example doesn't support the -t option)
return getsnapsfallback($type,$rhost,$fs,$isroot,%snaps);
return getsnapsfallback($type,$rhostOriginal,$fs,$isroot,%snaps);
};
# this is a little obnoxious. get guid,creation returns guid,creation on two separate lines