projects
/
zfs-ubuntu
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added logging to zfs-scrub
[zfs-ubuntu/.git]
/
zfs-autosnap
diff --git
a/zfs-autosnap
b/zfs-autosnap
index e7d939e9746453acfc0ac73d58f3cb5775f163fb..cfe80aaab8adb067e0cfa1615186f716ce96f548 100755
(executable)
--- a/
zfs-autosnap
+++ b/
zfs-autosnap
@@
-8,7
+8,7
@@
PATH=/usr/sbin:/sbin:$PATH
if [ -z "$SNAP_UNDER_TEST" ]; then
PATH=/usr/sbin:/sbin:$PATH
if [ -z "$SNAP_UNDER_TEST" ]; then
- exec >> /var/log/snap.log 2>&1
+ exec >> /var/log/
zfs/zfs-auto
snap.log 2>&1
fi
# This script makes the following assumptions/requirements:
fi
# This script makes the following assumptions/requirements:
@@
-130,8
+130,8
@@
for snapshot in $snapshots; do
case $((snapminutes2 % window)) in
0) ;;
*)
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
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
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
destroy "$snapname"
fi
done