From 838cbe50cfda3bbfa6752f13c7cdd57ab2c90cc9 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sun, 24 Apr 2005 20:30:55 +0000 Subject: [PATCH] use the new getAllVservers() functionality to specify special kinds of vservers git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2044 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/start-vservers | 33 +++++++++++++++++---------------- util-vserver/scripts/vsomething | 18 +++++++++--------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/util-vserver/scripts/start-vservers b/util-vserver/scripts/start-vservers index 8db11c2..f35bf13 100755 --- a/util-vserver/scripts/start-vservers +++ b/util-vserver/scripts/start-vservers @@ -31,7 +31,7 @@ function showHelp() { echo \ $"Usage: $(basename $0) [-c ] [-m ] [-j + + [--start|--stop] [--all|--[un]marked|--running|--stopped] -- + Please report bugs to $PACKAGE_BUGREPORT" exit 0 @@ -60,12 +60,14 @@ function verifyVserver() set +e -tmp=$(getopt -o c:j:m: --long debug,help,version,start,stop,test,all -n "$0" -- "$@") || exit 1 +tmp=$(getopt -o c:j:m: \ + --long debug,help,version,start,stop,test,$VS_ALLVSERVERS_ARGS \ + -n "$0" -- "$@") || exit 1 eval set -- "$tmp" +declare -a tmp_vservers=() declare -r TAB=$(echo -en "\t") OPTION_MARK= -OPTION_ALL= OPTION_PARALLEL=99 OPTION_DEBUG= NOOPTION_DEBUG=1 @@ -77,18 +79,18 @@ case "`basename $0`" in esac while true; do + getAllVserversByArg tmp_vservers "$1" || \ case "$1" in - --help) showHelp $0 ;; - --version) showVersion $0 ;; - -c) CONFDIR=$2; shift;; - -m) OPTION_MARK=$2; shift;; - -j) OPTION_PARALLEL=$2; shift;; - --start) OPTION_FLAVOR=start;; - --stop) OPTION_FLAVOR=stop;; - --all) OPTION_ALL=1;; - --debug) OPTION_DEBUG=1; NOOPTION_DEBUG=; set -x;; - --) shift; break;; - *) echo $"$0: internal error; arg=='$1'" >&2; exit 1;; + (--help) showHelp $0 ;; + (--version) showVersion $0 ;; + (-c) CONFDIR=$2; shift;; + (-m) OPTION_MARK=$2; shift;; + (-j) OPTION_PARALLEL=$2; shift;; + (--start) OPTION_FLAVOR=start;; + (--stop) OPTION_FLAVOR=stop;; + (--debug) OPTION_DEBUG=1; NOOPTION_DEBUG=; set -x;; + (--) shift; break;; + (*) echo $"$0: internal error; arg=='$1'" >&2; exit 1;; esac shift done @@ -98,8 +100,7 @@ test -n "$OPTION_FLAVOR" || { exit 1 } -vservers=( "$@" ) -test -z "$OPTION_ALL" || getAllVservers vservers +vservers=( "$@" "${tmp_vservers[@]}" ) orig_vservers=$vservers i=${#vservers[*]} diff --git a/util-vserver/scripts/vsomething b/util-vserver/scripts/vsomething index 46a4b26..5567869 100755 --- a/util-vserver/scripts/vsomething +++ b/util-vserver/scripts/vsomething @@ -75,15 +75,15 @@ title=${VSOMETHING_TITLE:-$cmd} shift while test "$#" -ge 1; do - case "$1" in - --) shift; break;; - --all) - getAllVservers tmp - vservers=( "${vservers[@]}" "${tmp[@]}" ) - ;; - *) vservers=( "${vservers[@]}" "$1" ) - esac - shift + if getAllVserversByArg tmp "$1"; then + vservers=( "${vservers[@]}" "${tmp[@]}" ) + else + case "$1" in + (--) shift; break;; + (*) vservers=( "${vservers[@]}" "$1" ) + esac + fi + shift done -- 1.8.1.5