From: Enrico Scholz Date: Tue, 9 Mar 2004 16:38:30 +0000 (+0000) Subject: use $_CHONTEXT_COMPAT explicitly X-Git-Tag: VERSION_0_10~384 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a11b0e56f506b55e513ce5642554f5eb6d300451;p=util-vserver.git use $_CHONTEXT_COMPAT explicitly git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1190 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver.stop b/util-vserver/scripts/vserver.stop index dccf38e..c6e6930 100644 --- a/util-vserver/scripts/vserver.stop +++ b/util-vserver/scripts/vserver.stop @@ -40,7 +40,7 @@ else "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ - "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ + $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" . "${INITCMD_STOP[@]}" && \ "${INITCMD_STOP_SYNC[@]}" || : fi diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index aa8546e..748f275 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -38,7 +38,7 @@ else "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ - "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ + $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . \ "$@" fi