X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver;h=881356087ded7d9f6ff47c6c8d5e6c500682b1ae;hb=de1e8b57109c4add4b4406d62fe67c3fe6ee8ffe;hp=f169c44b2ab0f9c179ccd6b65ae8dd67d7237c52;hpb=2fa9c5d3119c81c9d2effcb66c643e0196a65e47;p=util-vserver.git diff --git a/scripts/vserver b/scripts/vserver index f169c44..8813560 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 @@ -59,8 +59,8 @@ Possible commands are: ... builds a new vserver from scratch delete ... remove a vserver - unify [-R] - ... (de)unify vserver + unify [-R] * + ... (de)unify the vserver with its reference vserver(s). pkg install ... installs package(s) in the vserver @@ -77,8 +77,8 @@ Possible commands are: while 'internalize' means that data and programs from the vserver will be used. - unify * - ... unify the vserver with its reference vserver(s). + hashify + ... hashify the guest. Please report bugs to $PACKAGE_BUGREPORT" @@ -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= @@ -189,11 +190,7 @@ Possible solutions: exit 5 } >&2 -if test -e "$VSERVER_DIR"/name; then - read VSERVER_NAME <"$VSERVER_DIR"/name -else - VSERVER_NAME=$(basename "$VSERVER_DIR") -fi +_setVserverName # Create a new namespace when starting the guest test "$2" != start -o -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \ @@ -205,6 +202,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 +227,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[@]}" ;;