X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=zfs-autosnap;h=cfe80aaab8adb067e0cfa1615186f716ce96f548;hb=044c7d0a0fb4de5c6ae6828e3e31d92a13c851db;hp=e7d939e9746453acfc0ac73d58f3cb5775f163fb;hpb=ffae499fdb9dc7c65114534338857efc6e8b0c87;p=zfs-ubuntu%2F.git

diff --git a/zfs-autosnap b/zfs-autosnap
index e7d939e..cfe80aa 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:
@@ -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