X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=zfs-autosnap;h=da9090635011700f3b876e2c06e03befe417540b;hb=984d48e66a916fd9ba533ae19b43aafd449dad77;hp=e7d939e9746453acfc0ac73d58f3cb5775f163fb;hpb=ffae499fdb9dc7c65114534338857efc6e8b0c87;p=zfs-ubuntu%2F.git

diff --git a/zfs-autosnap b/zfs-autosnap
index e7d939e..da90906 100755
--- a/zfs-autosnap
+++ b/zfs-autosnap
@@ -8,7 +8,7 @@
 PATH=/usr/sbin:/sbin:$PATH
 
 if [ -z "$SNAP_UNDER_TEST" ]; then
-    exec >> /var/log/snap.log 2>&1
+    exec >> /var/log/zfs/zfs-autosnap.log 2>&1
 fi
 
 # This script makes the following assumptions/requirements:
@@ -50,7 +50,7 @@ filesystem=$1
 mountpoint=${2-/$1}
 numsnapshots=${3-12}
 maxagedays=${4-0}
-lockdir="/tmp/${filesystem}.lock"
+lockdir="/tmp/zfs-admin-lock"
 pool=`echo "$filesystem" | awk -F '/' '{ print $1 }'`
 
 if [ -z "$filesystem" ] || [ -z "$mountpoint" ] || [ -z "$numsnapshots" ] || [ -z "$maxagedays" ]; then
@@ -111,8 +111,8 @@ snapshot "${filesystem}@${datetime}"
 
 minutes=$(echo $datetime | datetime_to_minutes)
 
-lockdir="/tmp/zfs-admin-lock"
 if ! mkdir "$lockdir" >/dev/null 2>&1; then
+  echo "-W- The zfs filesystem has been locked down. Skipping snapshot cleanup."
   exit 0
 fi
 cleanup() { rm -rf "$lockdir"; }
@@ -130,8 +130,8 @@ for snapshot in $snapshots; do
       case $((snapminutes2 % window)) in
         0) ;;
         *)
-          snapname=$(echo "$snapshot" |
-                       sed 's,/\(.*\)/.zfs/snapshot/\(.*\),\1@\2,')
+          snapname=${filesystem}$(echo "$snapshot" |
+                                  sed 's,/\(.*\)/.zfs/snapshot/\(.*\),@\2,')
           destroy "$snapname"
         ;;
       esac
@@ -140,8 +140,8 @@ for snapshot in $snapshots; do
     window=$((window*2))
   done
   if [ $maxagedays -gt 0 ] && [ $age -gt $((maxagedays * 24 * 60)) ]; then
-    snapname=$(echo "$snapshot" |
-                     sed 's,/\(.*\)/.zfs/snapshot/\(.*\),\1@\2,')
+    snapname=${filesystem}$(echo "$snapshot" |
+                            sed 's,/\(.*\)/.zfs/snapshot/\(.*\),@\2,')
     destroy "$snapname"
   fi
 done