From 866b1683da2f65ef03f24102d3e81bb199991bab Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Thu, 8 Apr 2004 06:06:02 +0000 Subject: [PATCH] implemented support for default-scriptlets (inspired by ideas of Olivier Poitrey) git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1441 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver.functions | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 601af85..045f8f6 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -730,11 +730,20 @@ function execScriptlets local name=$2 local flavor=$3 local start= - local i + local base i + + + for base in "$vdir"/scripts "$CONFDIR"/.defaults/scripts; do + local DONT_SKIP_DEFAULTS= + local already_handled= + + for i in "$base/$flavor" "$base/$flavor.d"/*; do + test -f "$i" -a -r "$i" || continue + already_handled=1 + test -x "$i" || start=_sourceWrap + $start "$i" "$flavor" "$name" + done - for i in "$vdir/scripts/$flavor" "$vdir/scripts/$flavor.d"/*; do - test -f "$i" -a -r "$i" || continue - test -x "$i" || start=_sourceWrap - $start "$i" "$flavor" "$name" + test -z "$already_handled" -o "$DONT_SKIP_DEFAULTS" || break done } -- 1.8.1.5