X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.suexec;h=8aada8067878aaa50e16dcc757a5c4c0ce8715e4;hb=aa9fbadb3608769b43e31916d82f2eecd742715c;hp=bb6992ca86ef575993ba512194a2180cc001c742;hpb=e035f164c858115c488d0f2fc1e0d356a9096996;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index bb6992c..8aada80 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -29,16 +29,16 @@ cd "$VSERVER_DIR"/vdir/ if $_VSERVER_INFO - FEATURE migrate; then exec \ - ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ - $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" --uid "$user" \ - -- "$@" + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ + $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" --uid "$user" -- \ + "$@" else exec \ "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ - ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT"} \ - "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" --} \ + $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" -- \ "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . \ - -- "$@" + "$@" fi