X-Git-Url: http://git.pippins.net/embedvideo/.git/.%24link.?a=blobdiff_plain;f=zfs-scrub;h=462d97924f79f9f14e6d274e6c550841713bbb47;hb=cc81a4f1a8387e6991eb447383cae05220a65d15;hp=6488beb1aba222c80c5d29043e4700fd0ff8d6e5;hpb=2829ebd14041598193f7291c472380a257afda7d;p=zfs-ubuntu%2F.git

diff --git a/zfs-scrub b/zfs-scrub
index 6488beb..462d979 100755
--- a/zfs-scrub
+++ b/zfs-scrub
@@ -6,11 +6,15 @@
 #              running at any given time. This serializes the zfs 
 #              scrub process for any pool.
 
-PATH=/usr/sbin:/sbin:/etc/bin:$PATH
+# source our configuration
+config="${0%/*}/zfs-scripts.conf"
+[ -e "${config}.dist" ] && . ${config}.dist
+[ -e "${config}" ] && . ${config}
+
+exec >> $logdir/zfs-scrub.log 2>&1
 
 pools="$*"
 maxsleeptime=360
-mailto=root
 
 if [ -z "$pools" ]; then
    echo "-E- Usage: $0 <pools>"
@@ -22,7 +26,7 @@ do
   # 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
@@ -40,7 +44,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
@@ -56,10 +60,10 @@ 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 | /usr/bin/mailx -s "zpool scrub $i found errors" $mailto 
+    zpool status $i | $mailx -s "zpool scrub $i found errors" $mailto 
   fi 
 
 done