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=d3f63271cbc9caa809bd82a137f2a805651ecd48;hpb=ffb682712dda87ea8993e5f9d59fb54366c3a795;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index d3f6327..8aada80 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -16,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[@]}" \ - "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . "$@" - + "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" --} \ + $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" -- \ + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . \ + "$@" +fi