X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.functions;h=80befc07ab6803079c7b07bf1c729ee4ba82c140;hb=38c1cc93ce7ca27a849d63e3769e4cc798d3e3c0;hp=045f8f68efc8a9a966ebeb8207159d08d3d2cc07;hpb=866b1683da2f65ef03f24102d3e81bb199991bab;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 045f8f6..80befc0 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -607,6 +607,7 @@ function generateOptions if test "$_IS_FAKEINIT"; then CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) + OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --flag fakeinit ) OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect ) fi } @@ -719,19 +720,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 +739,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