From f15ecabbb38a6e332eaf97194534e4af07e7b646 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Mon, 29 Jan 2007 02:06:30 +0000 Subject: [PATCH] There's no need to enter the filesystem namespaces twice. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2481 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- scripts/vserver.stop | 2 -- scripts/vserver.suexec | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/vserver.stop b/scripts/vserver.stop index bec9381..4d637ea 100644 --- a/scripts/vserver.stop +++ b/scripts/vserver.stop @@ -71,14 +71,12 @@ if test -n "$_IS_FAKEINIT" && \ ## is implemented elif $_VSERVER_INFO - FEATURE migrate; then "${NICE_CMD[@]}" \ - ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" -- \ "${INITCMD_STOP[@]}" || fail=1 else "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ - ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" "." \ "${INITCMD_STOP[@]}" || fail=1 diff --git a/scripts/vserver.suexec b/scripts/vserver.suexec index bc6a7db..b91f7f3 100644 --- a/scripts/vserver.suexec +++ b/scripts/vserver.suexec @@ -29,6 +29,8 @@ shift cd "$VSERVER_DIR"/vdir/ +test -z "$OPTION_NONAMESPACE" || USE_VNAMESPACE= + if $_VSERVER_INFO - FEATURE migrate; then if test -z "$is_stopped"; then exec \ -- 1.8.1.5