X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver;h=f4080a62410875dfd2153e620ed90f2ee6c83bf5;hb=4434ece05f02e6f5bebd6854172e1de056b405c2;hp=f169c44b2ab0f9c179ccd6b65ae8dd67d7237c52;hpb=2fa9c5d3119c81c9d2effcb66c643e0196a65e47;p=util-vserver.git diff --git a/scripts/vserver b/scripts/vserver index f169c44..f4080a6 100755 --- a/scripts/vserver +++ b/scripts/vserver @@ -37,7 +37,7 @@ $"Usage: $(basename $0) [-s|--sync] [-v|--verbose] [--silent] is the name of a vserver. Possible commands are: - start [--rescue] [ *] + start [--rescue [--rescue-init]] [ *] ... starts the specified vserver stop ... stops the specified vserver restart ... restarts the specified vserver; this is the subsequent @@ -153,7 +153,8 @@ SELF=( "$0" "${OPTION_ALL[@]}" ) vserver=$1 cmd=$2 -test "$cmd" != build || { shift 2; exec $_VNAMESPACE --new -- "$_VSERVER_BUILD" -n "$vserver" "$@"; } +test "$cmd" != build || { shift 2; exec $_VNAMESPACE --new -- \ + "$_VSERVER_BUILD" $OPTION_DEBUG -n "$vserver" "$@"; } allow_legacy= @@ -205,6 +206,9 @@ test "$2" != enter -a "$2" != stop || \ ! isVserverRunning "$VSERVER_DIR" || \ exec $_VNAMESPACE --enter "$VSERVER_DIR" -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}" +set_init_cwd +cd / + . $__PKGLIBDIR/vserver.functions case "$2" in (start|stop|delete) @@ -227,7 +231,8 @@ case "$2" in suexec 0 chkconfig "$@" ;; (enter) - OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin ) + useVlogin && \ + OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin ) getEnterShell "$VSERVER_DIR" suexec 0 "${ENTER_SHELL[@]}" ;;