X-Git-Url: http://git.pippins.net/embedvideo/.git/.%24link.?a=blobdiff_plain;ds=sidebyside;f=zfs-scrub;h=c7d6297c4114989fbc9fef4ddfac7936a2110efb;hb=ca396abc312461c5eb10134c34ec018f81009b9e;hp=939c798b4c6339e2e0523a39903b2f0e513afd55;hpb=471f2873d53eebe62223121be58bc3f795511a12;p=zfs-ubuntu%2F.git

diff --git a/zfs-scrub b/zfs-scrub
index 939c798..c7d6297 100755
--- a/zfs-scrub
+++ b/zfs-scrub
@@ -23,10 +23,25 @@ fi
 
 for i in $pools
 do
+  # Import the local pool if needed and option was given to do so, else error out
+  zpool list -H "$i" >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    if [[ $import_export_backup_pool == 1 ]]; then
+      zpool import $i
+      if [ $? != 0 ]; then
+        echo "-E- unable to import the pool $i"
+        exit 1
+      fi
+    else
+      echo "-E- The local pool, '$i' doesn't seem to exist."
+      exit 1
+    fi
+  fi
+
   # Check to see if any zfs filesystem has a scrub being performed on it now.
   # If it does, we cannot perform more than one scrub operation at a time.
   while true; do
-    zpool status | grep scrub: | grep "in progress" > /dev/null 2>&1
+    zpool status | grep scan: | grep "in progress" > /dev/null 2>&1
     if [ $? == 0 ]; then
         # Another zpool scrub operation is already running
         # Wait until it is done before continuing
@@ -44,7 +59,7 @@ do
 
   # Wait until the scrub completes, and check for any errors
   while true; do
-    zpool status $i | grep scrub: | grep "in progress" > /dev/null 2>&1
+    zpool status $i | grep scan: | grep "in progress" > /dev/null 2>&1
     if [ $? == 0 ]; then
         # Our zpool scrub operation is still running
         # Wait until it is done before continuing
@@ -60,12 +75,23 @@ do
   echo "$date: Scrub completed for zfs pool $i"
 
   # Check for any scrub errors
-  zpool status $i | grep scrub: | grep "with 0 errors" > /dev/null 2>&1
+  zpool status $i | grep scan: | grep "with 0 errors" > /dev/null 2>&1
   if [ $? != 0 ]; then
     # The scrub found errors
     zpool status $i | $mailx -s "zpool scrub $i found errors" $mailto 
   fi 
 
-done
+  # Export the local pool if told to do so
+  if [[ $import_export_backup_pool == 1 ]]; then
+    zpool export $i
+    if [ $? != 0 ]; then
+      fatal_and_exit "-E- unable to export the local pool $i"
+    fi
+  fi
 
+  # Update NFS mounts
+  filesystems=`zfs list -t filesystem | grep "^$i" | grep -v "$i/$i" | grep -v "^$i " | awk '{ print $1 }' | tr '\n' ' '`
+  zfs set sharenfs=on $filesystems
+
+done