X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver;h=47aa6f5d45d62fd17e7eab7e8f2129d7d08a39db;hb=dfd7c5abfa53e81582a7ca7e88f6ab82dda39085;hp=3bcbbc570ca07fe86c0bcfa074059facb4de4672;hpb=a6f2d3abee42c99e6bb8fe627b9558db0ed1c6b8;p=util-vserver.git diff --git a/util-vserver/scripts/vserver b/util-vserver/scripts/vserver index 3bcbbc5..47aa6f5 100755 --- a/util-vserver/scripts/vserver +++ b/util-vserver/scripts/vserver @@ -18,9 +18,9 @@ # set -e -: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -31,7 +31,7 @@ test -e "$UTIL_VSERVER_VARS" || { function showHelp() { echo \ -$"Usage: $(basename $0) [-s|--sync] [-v|--verbose] +$"Usage: $(basename $0) [-s|--sync] [-v|--verbose] [--silent] [--] * is the name of a vserver. @@ -97,28 +97,56 @@ the GNU General Public License. This program has absolutely no warranty." exit 0 } +function suexec() +{ + . $PKGLIBDIR/vserver.suexec +} + +function restart() +{ + "${SELF[@]}" --sync "$vserver" stop + exec "${SELF[@]}" "$vserver" start +} + +function msg() +{ + test -z "$OPTION_SILENT" || return 0 + echo "$@" +} ### main starts here set +e -tmp=$(getopt -o +sv --long help,version,sync,verbose -n "$0" -- "$@") || exit 1 +OPTIONS_ORIG=( "$@" ) +tmp=$(getopt -o +sv --long nonamespace,--nonamespace,--insecure,help,debug,version,sync,verbose,silent -n "$0" -- "$@") || exit 1 eval set -- "$tmp" OPTION_FORCE_SYNC= OPTION_VERBOSE= +OPTION_SILENT= +OPTION_DEBUG= +OPTION_NONAMESPACE= +OPTION_INSECURE= while true; do case "$1" in - --help) showHelp $0 ;; - --version) showVersion ;; - -v|--verbose) OPTION_VERBOSE=1; shift;; - -s|--sync) OPTION_FORCE_SYNC=1; shift;; - --) shift; break;; - *) echo $"vserver: internal error; arg=='$1'"; exit 1;; + (--help) showHelp $0 ;; + (--version) showVersion ;; + (--debug) OPTION_DEBUG=$1; set -x;; + (-v|--verbose) OPTION_VERBOSE=$1;; + (-s|--sync) OPTION_FORCE_SYNC=$1;; + (--silent) OPTION_SILENT=$1;; + (----nonamespace)OPTION_NONAMESPACE=$1;; + (----insecure) OPTION_INSECURE=1;; + (--) shift; break;; + (*) echo $"vserver: internal error; arg=='$1'" >&2; exit 1;; esac + shift done +OPTION_ALL=( $OPTION_SILENT $OPTION_VERBOSE $OPTION_DEBUG ) +SELF=( "$0" "${OPTION_ALL[@]}" ) vserver=$1 cmd=$2 @@ -129,11 +157,11 @@ test "$cmd" != build || { shift 2; exec "$_VSERVER_BUILD" -n "$vserver" "$@"; } allow_legacy= case "$vserver" in - ./*) VSERVER_DIR=`pwd`/$vserver;; - /*) VSERVER_DIR=$vserver;; - *) VSERVER_DIR=$CONFDIR/$vserver - allow_legacy=1 - ;; + (./*) VSERVER_DIR=`pwd`/$vserver;; + (/*) VSERVER_DIR=$vserver;; + (*) VSERVER_DIR=$CONFDIR/$vserver + allow_legacy=1 + ;; esac if test "$allow_legacy"; then @@ -142,15 +170,17 @@ if test "$allow_legacy"; then 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" + echo $"WARNING: can not find configuration, assuming legacy method" >&2 exec "$_VSERVER_LEGACY" "$@" } fi test -d "$VSERVER_DIR" || { - echo "Can not find vserver-setup" + echo $"\ +Can not find vserver-setup; please make sure that the vserver configuration +is located at $VSERVER_DIR/." exit 1 -} +} >&2 if test -e "$VSERVER_DIR"/name; then read VSERVER_NAME <"$VSERVER_DIR"/name @@ -158,71 +188,79 @@ else VSERVER_NAME=$(basename "$VSERVER_DIR") fi +test "$2" != start -o "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \ + exec $_VNAMESPACE --new -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}" + . $PKGLIBDIR/vserver.functions case "$2" in - start|stop|suexec) + (start|stop) shift 2 . $PKGLIBDIR/vserver.$cmd ;; - restart) - "$0" --sync "$1" stop - exec "$0" "$1" start + (suexec|restart) + shift 2 + $cmd "$@" ;; - condrestart) - test ! isVserverRunning "$VSERVER_DIR" || exec "$0" "$1" restart + (condrestart) + test ! isVserverRunning "$VSERVER_DIR" || restart ;; - exec) + (exec) shift 2 - exec "$0" "$vserver" suexec root "$@" + suexec root "$@" ;; - chkconfig) + (chkconfig) shift 2 - exec "$0" "$vserver" suexec root chkconfig "$@" + suexec root chkconfig "$@" ;; - enter) + (enter) getEnterShell "$VSERVER_DIR" - exec "$0" "$1" suexec root "${ENTER_SHELL[@]}" + suexec root "${ENTER_SHELL[@]}" ;; - running) + (running) isVserverRunning "$VSERVER_DIR" ;; - unify) + (unify) shift 2 exec $_VUNIFY "$@" "$vserver" ;; - pkg) + (pkg) shift 2 exec $_VPKG "$vserver" "$@" ;; - apt-get|apt-config|apt-cache) + (pkgmgmt) + op=$3 + shift 3 + exec $_PKGMGMT ${op:+--$op} "$@" -- "$vserver" + ;; + + (apt-get|apt-config|apt-cache) export _APT_GET=$2 shift 2 exec $_VAPT_GET -- "$@" ;; - rpm) + (rpm) exec $_VRPM -- "$@" ;; - status) + (status) if getVserverStatus "$VSERVER_DIR" ctx procnum; then - echo $"Vserver '$1' is running at context '$ctx'" + msg $"Vserver '$vserver' is running at context '$ctx'" if test "$2" = status; then - echo $"Number of processes:" $procnum - echo -n $"Uptime: " - "$_FILETIME" "$VSERVER_DIR/run" + msg $"Number of processes: " $procnum + msg $"Uptime: " $("$_FILETIME" "$VSERVER_DIR/run") fi exit 0 else - echo $"Vserver '$1' is not running" + msg $"Vserver '$vserver' is not running" exit 1 fi ;; - *) - echo $"Usage: $0 {start|stop|suexec|restart|condrestart|exec|enter|chkconfig|running|status}" + (*) + echo $"Usage: $0 {start|stop|suexec|restart|condrestart|exec|enter|chkconfig|running|status}" >&2 exit 2 ;; esac