X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=zfs-autosnap-wrapper;fp=zfs-autosnap-wrapper;h=ab09272e22c471d1609ec251337dbdf1002fd1f5;hb=471f2873d53eebe62223121be58bc3f795511a12;hp=813d9fe6140edbe2188df8bc057da490b37616af;hpb=9a12c36d03babea71bd13dc208a64ff91f61b699;p=zfs-nexenta%2F.git

diff --git a/zfs-autosnap-wrapper b/zfs-autosnap-wrapper
index 813d9fe..ab09272 100755
--- a/zfs-autosnap-wrapper
+++ b/zfs-autosnap-wrapper
@@ -4,16 +4,20 @@
 # Description: This script is a wrapper script that calls zfs-autosnap
 #              for each filesystem provided below.
 
+# source our configuration
+config="${0%/*}/zfs-scripts.conf"
+[ -e "${config}.dist" ] && . ${config}.dist
+[ -e "${config}" ] && . ${config}
+
 # Setup some default values
-autosnap="/usr/local/etc/bin/zfs-autosnap"
-logfile="/var/log/zfs/zfs-autosnap.log"
-lockdir="/tmp/zfs-autosnap-all"
+logfile="$logdir/zfs-autosnap.log"
 numsnapshots=20
 maxagedays=365
 date=`date`
+mylockdir="/tmp/zfs-autosnap-all"
 
 # Make sure we aren't already running
-if ! mkdir "$lockdir" >/dev/null 2>&1; then
+if ! mkdir "$mylockdir" >/dev/null 2>&1; then
   echo "$date Another $0 process is already running" >> $logfile
   exit 1
 fi
@@ -22,16 +26,12 @@ fi
 date >> $logfile
 
 # Special filesystems
-$autosnap storage /storage $numsnapshots 15
-$autosnap tank/usr/videos /usr/videos $numsnapshots 15
+zfs-autosnap storage /storage $numsnapshots 15
+zfs-autosnap tank/usr/videos /usr/videos $numsnapshots 15
 
 # Normal filesystems
-$autosnap tank / $numsnapshots $maxagedays 
-$autosnap tank/backup /backup $numsnapshots $maxagedays
-$autosnap tank/usr /usr $numsnapshots $maxagedays
-$autosnap tank/usr/home /usr/home $numsnapshots $maxagedays
-$autosnap tank/usr/local /usr/local $numsnapshots $maxagedays
-$autosnap tank/usr/local/etc /usr/local/etc $numsnapshots $maxagedays
+zfs-autosnap tank / $numsnapshots $maxagedays 
+zfs-autosnap tank/home /home $numsnapshots $maxagedays
 
 # Daily filesystems (only perform these at midnight)
 if [ `date +"%H:%M"` == "00:00" ]; then 
@@ -41,8 +41,6 @@ fi
 # Weekly filesystems (only perform these on Sunday at midnight)
 if [ `date +"%H:%M:%u"` == "00:00:7" ]; then
   echo "Performing Weekly snapshots" >> $logfile
-  $autosnap tank/var /var $numsnapshots 60
-  $autosnap tank/usr/local/var /usr/local/var $numsnapshots 60
 fi
 
-rm -rf "$lockdir"
+rm -rf "$mylockdir"