EXCLUDE and ALL lists should be exported, take_snapshots() doesn't exist.

This commit is contained in:
Tim Foster 2008-08-26 12:17:37 +01:00
parent b4dc752a78
commit 77eda5fb7b

View File

@ -443,13 +443,13 @@ function take_snapshot {
print_note "Taking non-recursive snapshots $SINGLE_LIST" print_note "Taking non-recursive snapshots $SINGLE_LIST"
export snapshot_children=false export snapshot_children=false
export fs_name="$SINGLE_LIST" export fs_name="$SINGLE_LIST"
take_snapshots $FMRI no_propcache_repopulate take_snapshot $FMRI no_propcache_repopulate
single_STATE=$? single_STATE=$?
print_note "Taking recursive snapshots of $RECURSIVE_LIST" print_note "Taking recursive snapshots of $RECURSIVE_LIST"
export snapshot_childrent=false export snapshot_childrent=false
export fs_name="$RECURSIVE_LIST" export fs_name="$RECURSIVE_LIST"
take_snapshots $FMRI no_propcache_repopulate take_snapshot $FMRI no_propcache_repopulate
recursive_STATE=$? recursive_STATE=$?
return $single_STATE && $recursive_STATE return $single_STATE && $recursive_STATE
;; ;;
@ -806,8 +806,8 @@ function is_excluded {
function get_userprop_datasets { function get_userprop_datasets {
typeset LABEL=$1 typeset LABEL=$1
typeset ALL=/tmp/zfs-auto-snapshot-list.$$ export ALL=/tmp/zfs-auto-snapshot-list.$$
typeset EXCLUDE=/tmp/zfs-auto-snapshot-exclude.$$ export EXCLUDE=/tmp/zfs-auto-snapshot-exclude.$$
zfs list -H -t filesystem,volume -o \ zfs list -H -t filesystem,volume -o \
name,com.sun:auto-snapshot,com.sun:auto-snapshot:${LABEL} > $ALL name,com.sun:auto-snapshot,com.sun:auto-snapshot:${LABEL} > $ALL