X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=zfs-replicate;fp=zfs-replicate;h=60a23457d583c8555a0df88384cd44e29d0277cf;hb=0b70bfc0d86add94bad09cd7f5ef78e3fed92daf;hp=e6e6dd550d0fea239076a44309825c82ad568b19;hpb=d343c96fd4190924d3407cc9de1a12f66491670c;p=zfs-ubuntu%2F.git

diff --git a/zfs-replicate b/zfs-replicate
index e6e6dd5..60a2345 100755
--- a/zfs-replicate
+++ b/zfs-replicate
@@ -158,8 +158,10 @@ $ssh $remote \
     $zfs list -H -t snapshot |
     grep ^${remote_fs}@ |
     awk '{print$1}' > $remote_list
-if [ $? != 0 ]; then
-  fatal_and_exit "-E- remote $zfs list on $hostname command failed" $mailto
+if [[ $? != 0 ]] && [[ $expect_empty_remote_list == 0 ]]; then
+  echo "-W- Unable to find $remote_fs on the remote host $hostname. Unable to proceed since the"
+  echo "    expect_empty_remote_list option has not been set to allow this, skipping replicate operation."
+  fatal_and_exit "-E- remote $zfs list on $hostname for $remote_fs command failed" $mailto
 fi
 
 # List the snapshots on the local machine.