X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver;h=b253e867a87d57add3c528449d25caf14a6ad30c;hb=c5774d5529e0481e9c7d324f6ac6a343180ca3fa;hp=991c111aec559a4c977697b55effcd9b67b7694f;hpb=6f377550a2e5294b1d1f1ac9ce360ad5cff27e78;p=util-vserver.git diff --git a/util-vserver/scripts/vserver b/util-vserver/scripts/vserver index 991c111..b253e86 100755 --- a/util-vserver/scripts/vserver +++ b/util-vserver/scripts/vserver @@ -31,7 +31,8 @@ test -e "$UTIL_VSERVER_VARS" || { function showHelp() { echo \ -$"Usage: $(basename $0) [--] * +$"Usage: $(basename $0) [-s|--sync] [-v|--verbose] + [--] * is the name of a vserver. @@ -77,23 +78,30 @@ the GNU General Public License. This program has absolutely no warranty." set +e -tmp=$(getopt -o + --long help,version -n "$0" -- "$@") || exit 1 +tmp=$(getopt -o +sv --long help,version,sync,verbose -n "$0" -- "$@") || exit 1 eval set -- "$tmp" +OPTION_FORCE_SYNC= +OPTION_VERBOSE= + while true; do case "$1" in - --help) showHelp $0 ;; - --version) showVersion ;; - --) shift; break;; - *) echo $"vserver: internal error; arg=='$1'"; exit 1;; + --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;; esac done -test "$2" != build || { shift; exec "$_VSERVER_BUILD" "$@"; } vserver=$1 cmd=$2 +test "$cmd" != build || { shift 2; exec "$_VSERVER_BUILD" -n "$vserver" "$@"; } + + allow_legacy= case "$vserver" in @@ -133,7 +141,7 @@ case "$2" in . $PKGLIBDIR/vserver.$cmd ;; restart) - "$0" "$1" stop + "$0" --sync "$1" stop exec "$0" "$1" start ;; condrestart)