X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.suexec;h=bb6992ca86ef575993ba512194a2180cc001c742;hb=e035f164c858115c488d0f2fc1e0d356a9096996;hp=8d0cd72bab035f54342993f5bbcc0105eac38379;hpb=8d41f5c2d209d5450bf0a3e519e77d8259d6354d;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index 8d0cd72..bb6992c 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -1,5 +1,4 @@ -#! /bin/bash -# $Id$ +# $Id$ --*- sh -*-- # Copyright (C) 2003 Enrico Scholz # @@ -17,16 +16,29 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -isVserverRunning "$VSERVER_DIR" S_CONTEXT || : -generateOptions "$VSERVER_DIR" +isVserverRunning "$VSERVER_DIR" S_CONTEXT || { + echo $"'vserver ... suexec' is support for running vservers only; aborting..." >&2 + exit 1 +} +generateOptions "$VSERVER_DIR" user=$1 shift cd "$VSERVER_DIR"/vdir/ -exec \ -"${NICE_CMD[@]}" \ + +if $_VSERVER_INFO - FEATURE migrate; then + exec \ + ${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[@]}" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . "$@" - + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . \ + -- "$@" +fi