From 6cff6590dc1d10005b73d9e765d8c34ede131a59 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Tue, 28 Oct 2008 00:23:26 +0000 Subject: [PATCH] Rename flags to cflags. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2800 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- doc/configuration.xml | 46 ++++++----------------------------------- scripts/vserver-setup.functions | 2 +- scripts/vserver.functions | 6 ++++-- 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/doc/configuration.xml b/doc/configuration.xml index fe9bfe6..4133052 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -616,51 +616,17 @@ is the personality-type followed by flags (one item per line). See values. - + Contains per line a flag. See lib/cflags-v13.c for possible values. - + + + +Old name for cflags. Deprecated. + diff --git a/scripts/vserver-setup.functions b/scripts/vserver-setup.functions index 0122b18..b535203 100644 --- a/scripts/vserver-setup.functions +++ b/scripts/vserver-setup.functions @@ -220,7 +220,7 @@ function setup_writeOption test -z "$SETUP_FLAGS" || for i in "${SETUP_FLAGS[@]}"; do echo "$i" - done >"$cfgdir"/flags + done >"$cfgdir"/cflags ln -s "$SETUP_LOCKFILE" "$cfgdir"/run } 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 -- 1.8.1.5