projects
/
zfs-ubuntu
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added throttle option support
[zfs-ubuntu/.git]
/
zfs-autosnap
diff --git
a/zfs-autosnap
b/zfs-autosnap
index da9090635011700f3b876e2c06e03befe417540b..da650f53362fc2a35dca67aef2be9974b0f7aac4 100755
(executable)
--- a/
zfs-autosnap
+++ b/
zfs-autosnap
@@
-5,10
+5,13
@@
# It also employs an intelligent algorithm to roll off,
# or destroy, old snapshots.
# It also employs an intelligent algorithm to roll off,
# or destroy, old snapshots.
-PATH=/usr/sbin:/sbin:$PATH
+# source our configuration
+config="${0%/*}/zfs-scripts.conf"
+[ -e "${config}.dist" ] && . ${config}.dist
+[ -e "${config}" ] && . ${config}
-if [
-z "$SNAP_UNDER_TEST"
]; then
- exec >>
/var/log/zfs
/zfs-autosnap.log 2>&1
+if [
[ -z "$SNAP_UNDER_TEST" ]
]; then
+ exec >>
$logdir
/zfs-autosnap.log 2>&1
fi
# This script makes the following assumptions/requirements:
fi
# This script makes the following assumptions/requirements:
@@
-50,7
+53,6
@@
filesystem=$1
mountpoint=${2-/$1}
numsnapshots=${3-12}
maxagedays=${4-0}
mountpoint=${2-/$1}
numsnapshots=${3-12}
maxagedays=${4-0}
-lockdir="/tmp/zfs-admin-lock"
pool=`echo "$filesystem" | awk -F '/' '{ print $1 }'`
if [ -z "$filesystem" ] || [ -z "$mountpoint" ] || [ -z "$numsnapshots" ] || [ -z "$maxagedays" ]; then
pool=`echo "$filesystem" | awk -F '/' '{ print $1 }'`
if [ -z "$filesystem" ] || [ -z "$mountpoint" ] || [ -z "$numsnapshots" ] || [ -z "$maxagedays" ]; then