X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver;h=8b7e8cb36f55f382873353bd740d31c9f5b3dfa9;hb=ae8f5839c759113a738c058b90344ab54cfda3cf;hp=0ec364af3a135423b12d4047c56586a8e742e9e8;hpb=7e9164ec82411152c142ef532c93b88f59f63e0a;p=util-vserver.git diff --git a/scripts/vserver b/scripts/vserver index 0ec364a..8b7e8cb 100755 --- a/scripts/vserver +++ b/scripts/vserver @@ -31,7 +31,7 @@ test -e "$UTIL_VSERVER_VARS" || { function showHelp() { echo \ -$"Usage: $(basename $0) [-s|--sync] [-v|--verbose] [--silent] +$"Usage: $(basename $0) [-s|--sync] [-v|--verbose] [--silent] [--debug] [--] * is the name of a 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[@]}"