X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver;h=8b7e8cb36f55f382873353bd740d31c9f5b3dfa9;hb=c390488fa4eccc579046a06a3b08aa72e7458875;hp=044835b6a38f7ab5bd0100bed391d73c08d9c25d;hpb=82dab31ae667786b0193c1b7b74341ecc5046c61;p=util-vserver.git diff --git a/scripts/vserver b/scripts/vserver index 044835b..8b7e8cb 100755 --- a/scripts/vserver +++ b/scripts/vserver @@ -166,12 +166,13 @@ test "$cmd" != build || { shift 2; exec $_VNAMESPACE --new -- \ allow_legacy= case "$vserver" in - (./*) VSERVER_DIR=`pwd`/$vserver;; - (/*) VSERVER_DIR=$vserver;; - (*) VSERVER_DIR=$__CONFDIR/$vserver + (./*) VSERVER_DIR="`pwd`/$vserver";; + (/*) VSERVER_DIR="$vserver";; + (*) VSERVER_DIR="$__CONFDIR/$vserver" allow_legacy=1 ;; esac +VSERVER_DIR="${VSERVER_DIR%%/}" if test -n "$allow_legacy"; then do_legacy= @@ -199,11 +200,11 @@ Possible solutions: _setVserverName # Create a new namespace when starting the guest -test "$2" != start -o -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \ +test "$cmd" != start -o -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \ exec $_VNAMESPACE --new -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}" # Enter the namespace early so we can test for files inside the guest -test "$2" != enter -a "$2" != stop || \ +test "$cmd" != enter -a "$cmd" != stop || \ test -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \ ! isVserverRunning "$VSERVER_DIR" || \ exec $_VNAMESPACE --enter "$VSERVER_DIR" -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}"