X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-wrapper;h=abab44549d70f75328b27db35a5e6b6a252f7e01;hb=e11269f5d0b9fc622e14570d1274d85223d10567;hp=2e4df9f8372d1246463e6af885f210e2ac8dea2d;hpb=7579654afabf6a996464647e54187f262d230aa8;p=util-vserver.git diff --git a/scripts/vserver-wrapper b/scripts/vserver-wrapper index 2e4df9f..abab445 100755 --- a/scripts/vserver-wrapper +++ b/scripts/vserver-wrapper @@ -26,43 +26,13 @@ test -n "$MARK" || MARK=default : ${LOCKFILE:=vservers-$MARK} : ${NUMPARALLEL:=6} - -if test -e /etc/init.d/functions; then - . /etc/init.d/functions - _beginResult() { echo -n "$@"; } - lockfile=/var/lock/subsys/$LOCKFILE -elif test -e /etc/gentoo-release; then - . /sbin/functions.sh - _beginResult() { ebegin "$@"; } - success() { eend "$@"; } - passed() { eend "$@"; } - failure() { eend "$@"; } - lockfile=/var/lock/vservers/$LOCKFILE -else - _beginResult() { echo -n "$@"; } - success() { echo .; } - passed() { echo .; } - failure() { echo ERROR; } - lockfile=/var/run/$LOCKFILE -fi - -function _tellResult() -{ - local rc=$1 - case "$rc" in - (0) success;; - (2) passed; rc=0;; - (*) failure;; - esac - echo - return $rc -} +. "$_LIB_VSERVER_INIT_FUNCTIONS" function start() { - _beginResult $"Starting vservers of type '$MARK'..." + _beginResult $"Starting vservers of type '$MARK'" $_START_VSERVERS -m "$MARK" -j "$NUMPARALLEL" --all --start - _tellResult $? + _endResult $? local rc=$? test "$rc" -ne 0 || touch "$lockfile" return $rc @@ -70,9 +40,9 @@ function start() function stop() { - _beginResult $"Stopping vservers of type '$MARK'..." + _beginResult $"Stopping vservers of type '$MARK'" $_START_VSERVERS -m "$MARK" -j "$NUMPARALLEL" --all --stop - _tellResult $? + _endResult $? local rc=$? $_RM -f "$lockfile" return $rc