X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver.suexec;h=e5b0be76045bdba17b8c27be8e754c1eee3166f5;hb=95cf3519da76f335389cd7a18d0090b59f81f2e7;hp=aa8546e54a54642fb09752cc82314ee37ae1d7be;hpb=b9fac3468dd7ff6f2ba16080a84ce413233de63c;p=util-vserver.git diff --git a/util-vserver/scripts/vserver.suexec b/util-vserver/scripts/vserver.suexec index aa8546e..e5b0be7 100644 --- a/util-vserver/scripts/vserver.suexec +++ b/util-vserver/scripts/vserver.suexec @@ -15,8 +15,9 @@ # 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 support for running vservers only; aborting..." >&2 exit 1 } @@ -28,17 +29,28 @@ shift 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" \ - -- "$@" + if test -z "$is_stopped"; then + exec \ + $_CHBIND "${CHBIND_OPTS[@]}" \ + ${USE_VNAMESPACE:+$_VNAMESPACE --enter "$S_CONTEXT" -- } \ + $_VCONTEXT $SILENT_OPT --migrate --chroot --xid "$S_CONTEXT" --uid "$user" -- \ + "$@" + else + exec \ + $_CHBIND "${CHBIND_OPTS[@]}" \ + $_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" \ - ${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