From 77eda5fb7bd221c6e2db88cb9ebc78c7b9f528fd Mon Sep 17 00:00:00 2001 From: Tim Foster Date: Tue, 26 Aug 2008 12:17:37 +0100 Subject: [PATCH] EXCLUDE and ALL lists should be exported, take_snapshots() doesn't exist. --- src/lib/svc/method/zfs-auto-snapshot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/svc/method/zfs-auto-snapshot b/src/lib/svc/method/zfs-auto-snapshot index 42518ca..1679330 100755 --- a/src/lib/svc/method/zfs-auto-snapshot +++ b/src/lib/svc/method/zfs-auto-snapshot @@ -443,13 +443,13 @@ function take_snapshot { print_note "Taking non-recursive snapshots $SINGLE_LIST" export snapshot_children=false export fs_name="$SINGLE_LIST" - take_snapshots $FMRI no_propcache_repopulate + take_snapshot $FMRI no_propcache_repopulate single_STATE=$? print_note "Taking recursive snapshots of $RECURSIVE_LIST" export snapshot_childrent=false export fs_name="$RECURSIVE_LIST" - take_snapshots $FMRI no_propcache_repopulate + take_snapshot $FMRI no_propcache_repopulate recursive_STATE=$? return $single_STATE && $recursive_STATE ;; @@ -806,8 +806,8 @@ function is_excluded { function get_userprop_datasets { typeset LABEL=$1 - typeset ALL=/tmp/zfs-auto-snapshot-list.$$ - typeset EXCLUDE=/tmp/zfs-auto-snapshot-exclude.$$ + export ALL=/tmp/zfs-auto-snapshot-list.$$ + export EXCLUDE=/tmp/zfs-auto-snapshot-exclude.$$ zfs list -H -t filesystem,volume -o \ name,com.sun:auto-snapshot,com.sun:auto-snapshot:${LABEL} > $ALL