X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=zfs-replicate;h=7c6e65027f64f40f6af4bc56860bda74a688bfc1;hb=80e5913b92d256486d08d966ab2fa34d2d6046fb;hp=7f93696da6b12e29119e9a56236913ff02b4bd26;hpb=94f8e351810a6a69791c5a250353933e6dbb6027;p=zfs-ubuntu%2F.git

diff --git a/zfs-replicate b/zfs-replicate
index 7f93696..7c6e650 100755
--- a/zfs-replicate
+++ b/zfs-replicate
@@ -33,7 +33,14 @@ echo bogus.remote >> $remote_list
 echo bogus.local  >> $local_list
 common=$(diff -u $remote_list $local_list | grep '^ ' | tail -n 1)
 
-ssh $remote $zfs send -R -I${common/*@/@} $latest |
-    $zfs receive -vF -d ${local_pool}/${remote_fs%/*}
+if [ -n "$common" ]; then 
+  # We found a common snapshot
+  ssh $remote $zfs send -R -I${common/*@/@} $latest |
+      $zfs receive -vF -d ${local_pool}/${remote_fs%/*}
+else
+  # We did not find a common snapshot, so send the entire filesystem
+  ssh $remote $zfs send -R $latest |
+      $zfs receive -vF -d ${local_pool}/${remote_fs%/*}
+endif
 
 rm -f $local_list $remote_list