michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't add --rsh-command flag if not needed

Browse Source
This commit is contained in:
Jamie Cameron
2010-06-02 15:49:32 -07:00
parent 7532594cce
commit f648b63554
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fsdump/freebsd-lib.pl
View File

@@ -195,8 +195,10 @@ if ($_[0]->{'fs'} eq 'tar') {
$cmd .= " -M" if ($_[0]->{'multi'});
$cmd .= " -h" if ($_[0]->{'links'});
$cmd .= " -l" if ($_[0]->{'xdev'});
$cmd .= " -F \"$tapecmd $_[0]->{'id'}\"" if (!$_[0]->{'gzip'});
$cmd .= " --rsh-command=$_[0]->{'rsh'}" if ($_[0]->{'rsh'});
$cmd .= " -F \"$tapecmd $_[0]->{'id'}\""
if (!$_[0]->{'gzip'});
$cmd .= " --rsh-command=$_[0]->{'rsh'}"
if ($_[0]->{'rsh'} && $_[0]->{'host'});
$cmd .= " $_[0]->{'extra'}" if ($_[0]->{'extra'});
$cmd .= " '$_[0]->{'dir'}'";
}

12
fsdump/linux-lib.pl
View File

@@ -350,9 +350,12 @@ if ($_[0]->{'fs'} eq 'tar') {
$cmd .= " -M" if ($_[0]->{'multi'});
$cmd .= " -h" if ($_[0]->{'links'});
$cmd .= " --one-file-system" if ($_[0]->{'xdev'});
$cmd .= " -F \"$tapecmd $_[0]->{'id'}\"" if (!$_[0]->{'gzip'} && $tapecmd);
$cmd .= " --rsh-command=".quotemeta($_[0]->{'rsh'}) if ($_[0]->{'rsh'});
$cmd .= " --rmt-command=".quotemeta($_[0]->{'rmt'}) if ($_[0]->{'rmt'});
$cmd .= " -F \"$tapecmd $_[0]->{'id'}\""
if (!$_[0]->{'gzip'} && $tapecmd);
$cmd .= " --rsh-command=".quotemeta($_[0]->{'rsh'})
if ($_[0]->{'rsh'} && $_[0]->{'host'});
$cmd .= " --rmt-command=".quotemeta($_[0]->{'rmt'})
if ($_[0]->{'rmt'});
if ($_[0]->{'exclude'}) {
foreach my $e (&split_quoted_string($_[0]->{'exclude'})) {
$cmd .= " --exclude ".quotemeta($e);
@@ -479,7 +482,8 @@ else {
}
$vcmd .= $flag;
if ($_[0]->{'fs'} eq "tar") {
$vcmd .= " --rsh-command=$_[0]->{'rsh'}" if ($_[0]->{'rsh'});
$vcmd .= " --rsh-command=$_[0]->{'rsh'}"
if ($_[0]->{'rsh'} && $_[0]->{'host'});
}
elsif ($_[0]->{'fs'} ne "xfs") {
if ($_[0]->{'rsh'}) {