X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.suexec;h=88f1ae48069341fcb091644f1df139986d9f7f29;hb=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;hp=85d92e08fec06ea81f2ed77345369de473a88552;hpb=7fd5755b47f56f811eee13768539540facd29493;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index 85d92e0..88f1ae4 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -15,18 +15,45 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -isVserverRunning "$VSERVER_DIR" S_CONTEXT || : +is_stopped= +isVserverRunning "$VSERVER_DIR" S_CONTEXT || is_stopped=1 +test -z "$is_stopped" -o "$OPTION_INSECURE" || { + echo $"'vserver ... suexec' is supported 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 + if test -z "$is_stopped"; then + exec \ + $_CHBIND "${CHBIND_OPTS[@]}" \ + $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ + $_VCONTEXT $SILENT_OPT --migrate --chroot \ + --xid "$S_CONTEXT" --uid "$user" "${OPTS_VCONTEXT_ENTER[@]}" -- \ + "$@" + else + exec \ + $_CHBIND "${CHBIND_OPTS[@]}" \ + $_EXEC_ULIMIT "$VSERVER_DIR/ulimits" \ + $_VCONTEXT --create "${OPTS_VCONTEXT_CREATE[@]}" -- \ + $_VUNAME --xid self --dir "$VSERVER_DIR"/uts --missingok -- \ + $_VUNAME --xid self --set -t context="$VSERVER_DIR" -- \ + $_VCONTEXT --migrate-self --endsetup --chroot $SILENT_OPT -- \ + "$@" + fi +else + exec \ + "${NICE_CMD[@]}" \ "$_CHBIND" "${CHBIND_OPTS[@]}" \ "$_EXEC_ULIMIT" "$VSERVER_DIR/ulimits" \ - "$_CHCONTEXT" "${CHCONTEXT_OPTS[@]}" \ - "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . "$@" - + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" --} \ + $_CHCONTEXT_COMPAT "${CHCONTEXT_OPTS[@]}" -- \ + "$_CAPCHROOT" "${CAPCHROOT_OPTS[@]}" --suid "$user" . \ + "$@" +fi