if test -e /etc/init.d/functions; then
. /etc/init.d/functions
- _beginResult() { echo -n "$@"; }
+ _beginResult() { echo -n "$@ ..."; }
+ _postResult() { echo; }
lockfile=/var/lock/subsys/$LOCKFILE
elif test -e /etc/gentoo-release; then
. /sbin/functions.sh
_beginResult() { ebegin "$@"; }
- success() { eend "$@"; }
- passed() { eend "$@"; }
- failure() { eend "$@"; }
+ _postResult() { :; }
+ success() { eend 0; }
+ passed() { eend 0; }
+ failure() { eend 1; }
lockfile=/var/lock/vservers/$LOCKFILE
else
- _beginResult() { echo -n "$@"; }
+ _beginResult() { echo -n "$@ ..."; }
+ _postResult() { :; }
success() { echo .; }
passed() { echo .; }
failure() { echo ERROR; }
lockfile=/var/run/$LOCKFILE
fi
-function _tellResult()
+function _endResult()
{
local rc=$1
case "$rc" in
(2) passed; rc=0;;
(*) failure;;
esac
- echo
+ _postResult
return $rc
}
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
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