X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=zfs-scrub;h=4e220276666308cea8b63eb3b8e0b3c092928d75;hb=9abe0a87af0eedf581b9fae58fd1c62974ca004b;hp=fe94f81de80c4233556e25ab770a07264ad5dc47;hpb=f19b57818168810451d4722f458101884fd95b38;p=zfs-ubuntu%2F.git

diff --git a/zfs-scrub b/zfs-scrub
index fe94f81..4e22027 100755
--- a/zfs-scrub
+++ b/zfs-scrub
@@ -34,8 +34,8 @@ 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 ]] && [[ "$i" =~ "$backup_pool" ]]; then
-      zpool import $i
+    if [[ $import_export_backup_pool == 1 ]] && [[ "$backup_pool" =~ "$i" ]]; then
+      zpool import -f $i
       if [ $? != 0 ]; then
         fatal_and_exit "-E- unable to import the pool $i"
       fi
@@ -84,8 +84,8 @@ do
   # do this so we can check its status to see if it repaired any errors or not
   zpool list -H "$i" >/dev/null 2>&1
   if [ $? != 0 ]; then
-    if [[ $import_export_backup_pool == 1 ]] && [[ "$i" =~ "$backup_pool" ]]; then
-      zpool import $i
+    if [[ $import_export_backup_pool == 1 ]] && [[ "$backup_pool" =~ "$i" ]]; then
+      zpool import -f $i
       if [ $? != 0 ]; then
         fatal_and_exit "-E- unable to import the pool $i"
       fi
@@ -96,14 +96,14 @@ do
 
   # Check for any scrub errors
   zpool status $i | grep scan: 
-  zpool status $i | grep scan: | grep "with 0 errors" > /dev/null 2>&1
+  zpool status $i | grep scan: | grep -e "with 0 errors" -e "in progress" > /dev/null 2>&1
   if [ $? != 0 ]; then
     # The scrub found errors
     zpool status $i | $mailx -s "zpool scrub on $hostname $i found errors" "$mailto" 
   fi 
 
   # Export the local pool if told to do so
-  if [[ $import_export_backup_pool == 1 ]] && [[ "$i" =~ "$backup_pool" ]]; then
+  if [[ $import_export_backup_pool == 1 ]] && [[ "$backup_pool" =~ "$i" ]]; then
     # Don't export the pool if there is a currently running zfs-replicate operation
     ps -ef | grep -q "zfs-replicate" | grep -v grep
     if [ $? != 0 ]; then