From: Daniel Hokka Zakrisson Date: Thu, 8 Jul 2010 19:25:20 +0000 (+0000) Subject: Enter namespaces before context setup. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58df27cf3be8958d7a053fcbdddf93cd23a14ca9;p=util-vserver.git Enter namespaces before context setup. Use correct syntax. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2896 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/vserver.functions b/scripts/vserver.functions index e41334c..d979401 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -797,7 +797,7 @@ function _generateSpaceOptions OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid ) else OPTS_VSPACE_SHARED=( "${OPTS_VSPACE_SHARED[@]}" --pid ) - VSPACE_SHARED_CMD=( "${VSPACE_SHARED_CMD[@]}" $_VSPACE --enter --xid "$shared" --pid -- ) + VSPACE_SHARED_CMD=( "${VSPACE_SHARED_CMD[@]}" $_VSPACE --enter "$shared" --pid -- ) fi fi @@ -810,7 +810,7 @@ function _generateSpaceOptions OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --net ) else OPTS_VSPACE_SHARED=( "${OPTS_VSPACE_SHARED[@]}" --net ) - VSPACE_SHARED_CMD=( "${VSPACE_SHARED_CMD[@]}" $_VSPACE --enter --xid "$shared" --net -- ) + VSPACE_SHARED_CMD=( "${VSPACE_SHARED_CMD[@]}" $_VSPACE --enter "$shared" --net -- ) fi fi diff --git a/scripts/vserver.start b/scripts/vserver.start index 729d6ac..7cdf63b 100644 --- a/scripts/vserver.start +++ b/scripts/vserver.start @@ -136,6 +136,7 @@ is_configured=1 if $_VSERVER_INFO - FEATURE migrate; then ${IONICE_CMD[@]} \ ${NICE_CMD[@]} \ + "${VSPACE_SHARED_CMD[@]}" \ "${CHBIND_CMD[@]}" \ $_EXEC_ULIMIT "$VSERVER_DIR"/ulimits \ $_VTAG --create "${OPTS_VTAG_CREATE[@]}" --silent -- \ @@ -143,7 +144,6 @@ if $_VSERVER_INFO - FEATURE migrate; then $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ ${OPTION_STRACE:+$_STRACE -fF -o /tmp/vserver-start.$$} \ ${USE_VNAMESPACE:+$_VNAMESPACE --set -- } \ - "${VSPACE_SHARED_CMD[@]}" \ $_VSPACE --set "${OPTS_VSPACE[@]}" "${OPTS_VSPACE_SHARED[@]}" -- \ $_EXEC_REMOUNT /proc /sys -- \ $_VLIMIT --dir "$VSERVER_DIR"/rlimits --missingok -- \