From: Enrico Scholz Date: Thu, 8 Apr 2004 08:33:49 +0000 (+0000) Subject: execScriptlets(): fixed initialization of 'start' X-Git-Tag: VERSION_0_10~139 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6b9cbeda86c6b3422d4758f9dfdc95461b86fd;p=util-vserver.git execScriptlets(): fixed initialization of 'start' execScriptlets(): declare some variables as readonly _sourceWrap(): added some variables git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1442 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 045f8f6..1563d9c 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -719,19 +719,17 @@ will be killed nevertheless..." function _sourceWrap { - local vdir name flavor start i + local vdir name flavor start i already_handled base . "$@" } ## Usage: execScriptlets function execScriptlets { - local vdir=$1 - local name=$2 - local flavor=$3 - local start= + declare -r vdir=$1 + declare -r name=$2 + declare -r flavor=$3 local base i - for base in "$vdir"/scripts "$CONFDIR"/.defaults/scripts; do local DONT_SKIP_DEFAULTS= @@ -740,6 +738,7 @@ function execScriptlets for i in "$base/$flavor" "$base/$flavor.d"/*; do test -f "$i" -a -r "$i" || continue already_handled=1 + local start= test -x "$i" || start=_sourceWrap $start "$i" "$flavor" "$name" done