From 11008d3e8c9a5fc41e16b77925d6a9012ef6875e Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 22 Oct 2003 18:34:40 +0000 Subject: [PATCH] - reorganized CHCONTEXT_INIT_OPTS/CHCONTEXT_DISCONNECT: dropped the separate CHCONTEXT_DISCONNECT variable completetly and put '--flag fakeinit --disconnect' into CHCONTEXT_INIT_OPTS, which is used by 'vserver ... start' command only git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@282 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vserver.functions | 13 ++++--------- util-vserver/scripts/vserver.start | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/util-vserver/scripts/vserver.functions b/util-vserver/scripts/vserver.functions index 7a6fd87..111d23a 100644 --- a/util-vserver/scripts/vserver.functions +++ b/util-vserver/scripts/vserver.functions @@ -24,7 +24,6 @@ declare -a CHBIND_OPTS=() declare -a CAP_OPTS=() declare -a CHCONTEXT_INIT_OPTS=() declare -a CHCONTEXT_FLAG_OPTS=() -declare -a CHCONTEXT_DISCONNECT=() declare -a CHCONTEXT_OPTS=() declare -a CAPCHROOT_OPTS=() declare -a INTERFACES=() @@ -162,8 +161,7 @@ function _generateInitOptions xplain) INITCMD_START=( /sbin/init ) INITCMD_STOP=( /sbin/init ) - CHCONTEXT_INIT_OPTS=( --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" ) ;; @@ -171,8 +169,7 @@ function _generateInitOptions xminit) INITCMD_START=( /sbin/minit-start ) INITCMD_STOP=( /sbin/minit-stop ) - CHCONTEXT_INIT_OPTS=( --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) INITCMD_START_SYNC=( "$_INITSYNC_MINIT_START" "$vdir" ) INITCMD_STOP_SYNC=( "$_INITSYNC_MINIT_STOP" "$vdir" ) test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" ) @@ -210,8 +207,7 @@ function _generateFlagOptions x|x#) ;; dummy) ;; fakeinit) - CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag fakeinit ) - CHCONTEXT_DISCONNECT=( --disconnect ) + CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit ) ;; *) CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" @@ -241,7 +237,6 @@ function _generateChcontextOptions CHCONTEXT_OPTS=( $SILENT_OPT \ "${CHCONTEXT_FLAG_OPTS[@]}" \ - "${CHCONTEXT_INIT_OPTS[@]}" \ "${CAP_OPTS[@]}" \ --secure ${ctx:+--ctx "$ctx"} \ @@ -424,7 +419,7 @@ function mountVserver test -e "$cfgdir"/fstab || return 0 - findObject -r mtab_src "$CONFDIR"/.defaults/init/mtab "$vdir"/apps/init/mtab /dev/null + findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab /dev/null pushd "$vdir" >/dev/null $_CHROOT_CAT /etc/mtab <"$mtab_src" diff --git a/util-vserver/scripts/vserver.start b/util-vserver/scripts/vserver.start index ca0b0af..85dfcb9 100644 --- a/util-vserver/scripts/vserver.start +++ b/util-vserver/scripts/vserver.start @@ -34,7 +34,7 @@ execScriptlets "$VSERVER_DIR" "$VSERVER_NAME" pre-start "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ - "$_CHCONTEXT" "${CHCONTEXT_DISCONNECT[@]}" "${CHCONTEXT_OPTS[@]}" \ + "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" "${CHCONTEXT_INIT_OPTS[@]}" \ "$_SAVE_CTXINFO" "$VSERVER_DIR" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_START[@]}" -- 1.8.1.5