From: Alan J. Pippin <ajp@pippins.net>
Date: Sat, 10 Jan 2009 23:41:47 +0000 (-0700)
Subject: Updated paths
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/%7Bedit%7D?a=commitdiff_plain;h=0bc0c53b75f7b4aa0724c5da22caed66fe69de8f;p=zfs-ubuntu%2F.git

Updated paths
---

diff --git a/zfs-scrub b/zfs-scrub
index 1b068d4..aff4a38 100755
--- a/zfs-scrub
+++ b/zfs-scrub
@@ -6,6 +6,8 @@
 #              That only 1 scrub operation is running at any given time.
 #              This serializes the zfs scrub process for each pool.
 
+PATH=/usr/sbin:/sbin:$PATH
+
 maxsleeptime=360
 logfile=/var/log/zfs/zfs-scrub.log
 
@@ -14,7 +16,7 @@ do
   # Check to see if this 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
-    /sbin/zpool status | grep scrub: | grep "in progress" > /dev/null 2>&1
+    zpool status | grep scrub: | grep "in progress" > /dev/null 2>&1
     if [ $? == 0 ]; then
         # Another zpool scrub operation is already running
         # Wait until it is done before continuing
@@ -28,7 +30,7 @@ do
 
   date=`date`
   echo "$date: Scrub started for zfs pool $i" >> $logfile
-  /sbin/zpool scrub $i
+  zpool scrub $i
   sleep 60
 
 done
diff --git a/zfs-scrub-ext-drive b/zfs-scrub-ext-drive
index d9a54aa..b86dc5b 100755
--- a/zfs-scrub-ext-drive
+++ b/zfs-scrub-ext-drive
@@ -6,6 +6,8 @@
 #              running at any given time. This serializes the zfs 
 #              scrub process for any pool.
 
+PATH=/usr/sbin:/sbin:/etc/bin:$PATH
+
 maxsleeptime=360
 mailto=root
 logfile=/var/log/zfs/zfs-scrub.log
@@ -15,7 +17,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
-    /sbin/zpool status | grep scrub: | grep "in progress" > /dev/null 2>&1
+    zpool status | grep scrub: | grep "in progress" > /dev/null 2>&1
     if [ $? == 0 ]; then
         # Another zpool scrub operation is already running
         # Wait until it is done before continuing
@@ -29,13 +31,13 @@ do
 
   date=`date`
   echo "$date: Scrub started for zfs pool $i" >> $logfile
-  /usr/local/etc/bin/ext-drive-power on >> /dev/null
-  /sbin/zpool import $i
-  /sbin/zpool scrub $i
+  ext-drive-power on >> /dev/null
+  zpool import $i
+  zpool scrub $i
 
   # Wait until the scrub completes, and check for any errors
   while true; do
-    /sbin/zpool status $i | grep scrub: | grep "in progress" > /dev/null 2>&1
+    zpool status $i | grep scrub: | grep "in progress" > /dev/null 2>&1
     if [ $? == 0 ]; then
         # Our zpool scrub operation is still running
         # Wait until it is done before continuing
@@ -51,15 +53,15 @@ do
   echo "$date: Scrub completed for zfs pool $i" >> $logfile
 
   # Check for any scrub errors
-  /sbin/zpool status $i | grep scrub: | grep "with 0 errors" > /dev/null 2>&1
+  zpool status $i | grep scrub: | grep "with 0 errors" > /dev/null 2>&1
   if [ $? != 0 ]; then
     # The scrub found errors
-    /sbin/zpool status $i | /usr/bin/mailx -s "zpool scrub $i found errors" $mailto 
+    zpool status $i | /usr/bin/mailx -s "zpool scrub $i found errors" $mailto 
   fi 
 
   # Power off the EXT drive
-  /sbin/zpool export $i
-  /usr/local/etc/bin/ext-drive-power off >> /dev/null
+  zpool export $i
+  ext-drive-power off >> /dev/null
 
 done
 
diff --git a/zfs-snapshot-totals-cron b/zfs-snapshot-totals-cron
index 726ce3c..49779b8 100755
--- a/zfs-snapshot-totals-cron
+++ b/zfs-snapshot-totals-cron
@@ -1,8 +1,11 @@
 #!/bin/bash
 
-snapshot_totals="/usr/local/etc/bin/zfs-snapshot-totals"
+PATH=/usr/sbin:/sbin:/etc/bin:$PATH
+
+snapshot_totals="zfs-snapshot-totals"
 logfile="/var/log/zfs/zfs-snapshot-totals.log"
 
 date >> $logfile
 $snapshot_totals >> $logfile
 echo >> $logfile
+