X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=zfs-replicate;h=e6e6dd550d0fea239076a44309825c82ad568b19;hb=9eb1c325c28f5608ae26eeccc161f1fc5f70b083;hp=a5a3ad9653787db0fcd5798e5fccddc60c7082fc;hpb=042746138ba0f15394db01ce99dd5b5e81002451;p=zfs-ubuntu%2F.git diff --git a/zfs-replicate b/zfs-replicate index a5a3ad9..e6e6dd5 100755 --- a/zfs-replicate +++ b/zfs-replicate @@ -170,9 +170,9 @@ $zfs list -H -t snapshot | grep ^${backup_pool}/${remote_fs}@ | grep -v ^${backup_pool}/${current_backup_marker} | awk "{gsub(/^$backup_pool./,\"\",\$1); print\$1}" > $local_list -if [[ $? != 0 ]] && [[ $expect_empty_remote_list == 0 ]]; then - fatal_and_exit "-E- local $zfs list on $hostname command failed" $mailto -fi +# If no local snapshots exist, we may need to send the entire filesystem, which we'll do later +# So, no error check here as a non-zero return code means the local filesystem or snaps are missing +# We'll catch this later on as a case where we need to send the entire filesystem # Destroy the current backup marker snapshot on the remote system if it exists grep -q ${current_backup_marker} $remote_list