X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver;h=de19cd0dad6dddfdd983d477117f45b7e2e875d8;hb=c574f33e210c3438945209d685c218c51f74cbaa;hp=dcac60f5d99e9cf8590b89ce030d4162b8b95580;hpb=3c1a9f803ee89f50fa7315920c50ea5201d7f698;p=util-vserver.git diff --git a/util-vserver/scripts/vserver b/util-vserver/scripts/vserver index dcac60f..de19cd0 100755 --- a/util-vserver/scripts/vserver +++ b/util-vserver/scripts/vserver @@ -20,7 +20,7 @@ : ${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" @@ -108,12 +108,18 @@ function restart() exec "${SELF[@]}" "$vserver" start } +function msg() +{ + test -z "$OPTION_SILENT" || return 0 + echo "$@" +} + ### main starts here set +e OPTIONS_ORIG=( "$@" ) -tmp=$(getopt -o +sv --long nonamespace,--nonamespace,help,debug,version,sync,verbose,silent -n "$0" -- "$@") || exit 1 +tmp=$(getopt -o +sv --long nonamespace,--nonamespace,--insecure,defaulttty,help,debug,version,sync,verbose,silent -n "$0" -- "$@") || exit 1 eval set -- "$tmp" OPTION_FORCE_SYNC= @@ -121,23 +127,27 @@ OPTION_VERBOSE= OPTION_SILENT= OPTION_DEBUG= OPTION_NONAMESPACE= +OPTION_INSECURE= +OPTION_DEFAULTTTY= while true; do case "$1" in - --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;; - --) 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;; + (--defaulttty) OPTION_DEFAULTTTY=$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 ) +OPTION_ALL=( $OPTION_SILENT $OPTION_VERBOSE $OPTION_DEBUG $OPTION_DEFAULTTTY ) SELF=( "$0" "${OPTION_ALL[@]}" ) vserver=$1 @@ -149,11 +159,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 @@ -162,15 +172,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 @@ -179,73 +191,78 @@ else fi test "$2" != start -o "$OPTION_NONAMESPACE" || isAvoidNamespace "$VSERVER_DIR" || \ - exec $_NEW_NAMESPACE "$0" ----nonamespace "${OPTIONS_ORIG[@]}" + exec $_VNAMESPACE --new -- $_VSERVER ----nonamespace "${OPTIONS_ORIG[@]}" . $PKGLIBDIR/vserver.functions case "$2" in - start|stop) + (start|stop) shift 2 . $PKGLIBDIR/vserver.$cmd ;; - suexec|restart) + (suexec|restart) shift 2 $cmd "$@" ;; - condrestart) + (condrestart) test ! isVserverRunning "$VSERVER_DIR" || restart ;; - exec) + (exec) shift 2 suexec root "$@" ;; - chkconfig) + (chkconfig) shift 2 suexec root chkconfig "$@" ;; - enter) + (enter) getEnterShell "$VSERVER_DIR" 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 '$vserver' 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 '$vserver' 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