Reintroduced escapeshellparam for remote command and updated README file
This commit is contained in:
parent
670e76458c
commit
793f1c782b
|
@ -54,6 +54,10 @@ Which would be enough to tell sanoid to take and keep 36 hourly snapshots, 30 da
|
||||||
|
|
||||||
This will process your sanoid.conf file, it will NOT create snapshots, but it will purge expired ones.
|
This will process your sanoid.conf file, it will NOT create snapshots, but it will purge expired ones.
|
||||||
|
|
||||||
|
+ --force-prune
|
||||||
|
|
||||||
|
Purges expired snapshots even if a send/recv is in progress
|
||||||
|
|
||||||
+ --monitor-snapshots
|
+ --monitor-snapshots
|
||||||
|
|
||||||
This option is designed to be run by a Nagios monitoring system. It reports on the health of your snapshots.
|
This option is designed to be run by a Nagios monitoring system. It reports on the health of your snapshots.
|
||||||
|
@ -150,6 +154,10 @@ As of 1.4.18, syncoid also automatically supports and enables resume of interrup
|
||||||
|
|
||||||
This argument tells syncoid to restrict itself to existing snapshots, instead of creating a semi-ephemeral syncoid snapshot at execution time. Especially useful in multi-target (A->B, A->C) replication schemes, where you might otherwise accumulate a large number of foreign syncoid snapshots.
|
This argument tells syncoid to restrict itself to existing snapshots, instead of creating a semi-ephemeral syncoid snapshot at execution time. Especially useful in multi-target (A->B, A->C) replication schemes, where you might otherwise accumulate a large number of foreign syncoid snapshots.
|
||||||
|
|
||||||
|
+ --no-clone-rollback
|
||||||
|
|
||||||
|
Does not rollback clones on target
|
||||||
|
|
||||||
+ --no-resume
|
+ --no-resume
|
||||||
|
|
||||||
This argument tells syncoid to not use resumeable zfs send/receive streams.
|
This argument tells syncoid to not use resumeable zfs send/receive streams.
|
||||||
|
|
2
syncoid
2
syncoid
|
@ -366,7 +366,7 @@ sub syncdataset {
|
||||||
if ($debug) { print "DEBUG: rolling back target to $targetfs\@$matchingsnap...\n"; }
|
if ($debug) { print "DEBUG: rolling back target to $targetfs\@$matchingsnap...\n"; }
|
||||||
if ($targethost ne '') {
|
if ($targethost ne '') {
|
||||||
if ($debug) { print "$sshcmd $targethost $targetsudocmd $zfscmd rollback $rollbacktype $targetfs\@$matchingsnap\n"; }
|
if ($debug) { print "$sshcmd $targethost $targetsudocmd $zfscmd rollback $rollbacktype $targetfs\@$matchingsnap\n"; }
|
||||||
system ("$sshcmd $targethost $targetsudocmd $zfscmd rollback $rollbacktype $targetfs\@$matchingsnap");
|
system ("$sshcmd $targethost " . escapeshellparam("$targetsudocmd $zfscmd rollback $rollbacktype $targetfsescaped\@$matchingsnapescaped"));
|
||||||
} else {
|
} else {
|
||||||
if ($debug) { print "$targetsudocmd $zfscmd rollback $rollbacktype $targetfs\@$matchingsnap\n"; }
|
if ($debug) { print "$targetsudocmd $zfscmd rollback $rollbacktype $targetfs\@$matchingsnap\n"; }
|
||||||
system ("$targetsudocmd $zfscmd rollback $rollbacktype $targetfs\@$matchingsnap");
|
system ("$targetsudocmd $zfscmd rollback $rollbacktype $targetfs\@$matchingsnap");
|
||||||
|
|
Loading…
Reference in New Issue