X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver;h=21f1d3dcb58ea86c54e41ed8ba1747ddff7ce22b;hb=cc0e846b03b1250540445dd1f92083ee338898a2;hp=05adf2fa8623abaca761291478016e0676bc69bc;hpb=533930e2233561869411534fc91d94c5a6d0560c;p=util-vserver.git diff --git a/util-vserver/scripts/vserver b/util-vserver/scripts/vserver index 05adf2f..21f1d3d 100755 --- a/util-vserver/scripts/vserver +++ b/util-vserver/scripts/vserver @@ -1,7 +1,7 @@ #! /bin/bash # $Id$ -# Copyright (C) 2003 Enrico Scholz +# Copyright (C) 2003,2004,2005 Enrico Scholz # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,10 +37,9 @@ $"Usage: $(basename $0) [-s|--sync] [-v|--verbose] [--silent] is the name of a vserver. Possible commands are: - start [--nodeps] * + start [--rescue] [--rescue-cmd ] ... starts the specified vserver - stop [--nodeps] * - ... stops the specified vserver + stop ... stops the specified vserver restart ... restarts the specified vserver; this is the subsequent execution of a synchronized 'stop' and a 'start' condrestart ... restarts the vserver when it is running already @@ -91,7 +90,7 @@ function showVersion() $"vserver $PACKAGE_VERSION -- manages the state of vservers This program is part of $PACKAGE_STRING -Copyright (C) 2003 Enrico Scholz +Copyright (C) 2003,2004,2005 Enrico Scholz This program is free software; you may redistribute it under the terms of the GNU General Public License. This program has absolutely no warranty." exit 0 @@ -99,7 +98,7 @@ the GNU General Public License. This program has absolutely no warranty." function suexec() { - . $PKGLIBDIR/vserver.suexec + . $__PKGLIBDIR/vserver.suexec } function restart() @@ -161,15 +160,15 @@ allow_legacy= case "$vserver" in (./*) VSERVER_DIR=`pwd`/$vserver;; (/*) VSERVER_DIR=$vserver;; - (*) VSERVER_DIR=$CONFDIR/$vserver + (*) VSERVER_DIR=$__CONFDIR/$vserver allow_legacy=1 ;; esac -if test "$allow_legacy"; then +if test -n "$allow_legacy"; then do_legacy= test ! -e "$VSERVER_DIR/legacy" || do_legacy=1 - test -d "$VSERVER_DIR" -o ! -e "$CONFDIR/$vserver.conf" || do_legacy=1 + test -d "$VSERVER_DIR" -o ! -e "$__CONFDIR/$vserver.conf" || do_legacy=1 test -z "$do_legacy" || { echo $"WARNING: can not find configuration, assuming legacy method" >&2 @@ -179,8 +178,13 @@ fi test -d "$VSERVER_DIR" || { echo $"\ -Can not find vserver-setup; please make sure that the vserver configuration -is located at $VSERVER_DIR/." +Can not find a vserver-setup at '$VSERVER_DIR/'. + +Possible solutions: +* fix the spelling of the '$vserver' vserver name +* read 'vserver $vserver build --help' about ways to create a new vserver +* see 'vserver --help' for the syntax of this command +" exit 5 } >&2 @@ -190,14 +194,14 @@ else VSERVER_NAME=$(basename "$VSERVER_DIR") fi -test "$2" != start -o "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \ +test "$2" != start -o -n "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \ exec $_VNAMESPACE --new -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}" -. $PKGLIBDIR/vserver.functions +. $__PKGLIBDIR/vserver.functions case "$2" in (start|stop) shift 2 - . $PKGLIBDIR/vserver.$cmd + . $__PKGLIBDIR/vserver.$cmd ;; (suexec|restart) shift 2 @@ -226,7 +230,12 @@ case "$2" in shift 2 exec $_VUNIFY "$@" "$vserver" ;; - + + (hashify) + shift 2 + exec $_VHASHIFY "$@" "$vserver" + ;; + (pkg) shift 2 exec $_VPKG "$vserver" "$@"