projects
/
zfs-ubuntu
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made detecting if zpool is already mounted or unmounted better
[zfs-ubuntu/.git]
/
zfs-replicate
diff --git
a/zfs-replicate
b/zfs-replicate
index 9f72b0641904b5c44468d30b3fc4a10bdf82c757..9dfd9f8cbef7997e28bb6bd9ce72d164ce812250 100755
(executable)
--- a/
zfs-replicate
+++ b/
zfs-replicate
@@
-18,6
+18,13
@@
remote=$1
remote_fs=$2
remote_pool=${2%%/*}
remote_fs=$2
remote_pool=${2%%/*}
+# get the backup pool from the command line or the config file if not specified
+if [[ -n $3 ]]; then
+ backup_pool=$3
+else
+ backup_pool=${backup_pool%% *} # use the first backup pool if none specified
+fi
+
# Setup our cleanup and exit trap
cleanup() {
if [[ -e "$local_list" ]]; then
# Setup our cleanup and exit trap
cleanup() {
if [[ -e "$local_list" ]]; then
@@
-201,7
+208,7
@@
if [ $no_markers == 0 ]; then
fatal_and_exit "-E- remote incremental $zfs rollback command failed on $hostname" $mailto
fi
# Now it should be safe to send the snaps
fatal_and_exit "-E- remote incremental $zfs rollback command failed on $hostname" $mailto
fi
# Now it should be safe to send the snaps
- replicate "$zfs send -R -I${previous_backup_marker} ${current_backup_marker}"
+ replicate "$zfs send -R
c
-I${previous_backup_marker} ${current_backup_marker}"
if [ $? != 0 ]; then
fatal_and_exit "-E- remote incremental $zfs send command failed on $hostname" $mailto
fi
if [ $? != 0 ]; then
fatal_and_exit "-E- remote incremental $zfs send command failed on $hostname" $mailto
fi
@@
-220,7
+227,7
@@
else
if [[ -n "$common" ]]; then
# We found a common snapshot, incrementally send the new snaps
if [[ -n "$common" ]]; then
# We found a common snapshot, incrementally send the new snaps
- replicate "$zfs send -R -I${common/*@/@} ${current_backup_marker}"
+ replicate "$zfs send -R
c
-I${common/*@/@} ${current_backup_marker}"
if [ $? != 0 ]; then
fatal_and_exit "-E- remote incremental $zfs send command failed on $hostname" $mailto
fi
if [ $? != 0 ]; then
fatal_and_exit "-E- remote incremental $zfs send command failed on $hostname" $mailto
fi
@@
-242,7
+249,7
@@
else
fi
fi
# Send the full filesystem
fi
fi
# Send the full filesystem
- replicate "$zfs send -R ${current_backup_marker}"
+ replicate "$zfs send -R
c
${current_backup_marker}"
if [ $? != 0 ]; then
fatal_and_exit "-E- remote full $zfs send command failed on $hostname" $mailto
fi
if [ $? != 0 ]; then
fatal_and_exit "-E- remote full $zfs send command failed on $hostname" $mailto
fi