X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=a4dc8ed439ba416b345b1c06caf29e978e3ea8e8;hb=6cff6590dc1d10005b73d9e765d8c34ede131a59;hp=0997c2eff12e877480e1ce27134d984309bee519;hpb=3946d90487a8234e2ea12e4567f22fad24d642b3;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 0997c2e..a4dc8ed 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -381,10 +381,12 @@ function _generateInitOptions function _generateFlagOptions { local vdir=$1 + local file CHCONTEXT_FLAG_OPTS=() - test ! -e "$vdir"/flags || \ + findFile file "$vdir"/cflags "$vdir"/flags "" + test -z "$file" || \ while read flag; do case x"$flag" in (x|x\#*) ;; @@ -398,7 +400,7 @@ function _generateFlagOptions --flag "$flag" ) ;; esac - done <"$vdir"/flags + done <"$file" isAvoidNamespace "$vdir" || { USE_VNAMESPACE=1