X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=zfs-replicate-all;h=6fc9bfc269014181bd655fba682c64314b1ace6c;hb=f1a0eaf6cb15faf514577513f17fa9a06c34d129;hp=62a0ce4d10f60a78cde674427c974341596c413a;hpb=117f1e7cd08226590ffdc40c40464a2a8304ee7c;p=zfs-ubuntu%2F.git

diff --git a/zfs-replicate-all b/zfs-replicate-all
index 62a0ce4..6fc9bfc 100755
--- a/zfs-replicate-all
+++ b/zfs-replicate-all
@@ -50,11 +50,15 @@ cleanup_and_exit() {
 }
 trap cleanup_and_exit INT
 
-fatal_and_exit() {
+fatal() {
   # echo message to terminal
   echo -e 2>&1 "$1"
   # send email notification
   echo -e "$1" | $mailx -s "zfs-replicate-all on $hostname failed" "$mailto"
+}
+
+fatal_and_exit() {
+  fatal $*
   exit 1
 }
 
@@ -131,11 +135,12 @@ done
 # Export the local pool if told to do so
 if [[ $import_export_backup_pool == 1 ]]; then
   # Don't export the pool if there is a currently running zfs-scrub operation
-  ps -ef | grep -q "zfs-scrub ${backup_pool}" | grep -v grep
+  ps -ef | grep "zfs-scrub" | grep -q "${backup_pool}" | grep -v grep
   if [ $? != 0 ]; then
     zpool export $backup_pool
     if [ $? != 0 ]; then
-      fatal_and_exit "-E- unable to export the local backup pool $backup_pool on $hostname" "$mailto"
+      lsof /$backup_pool/*
+      fatal("-E- unable to export the local backup pool $backup_pool on $hostname")
     fi
   fi
 fi