backing out to version 208 of util-vserver

[util-vserver.git] / scripts / vserver-wrapper

diff --git a/scripts/vserver-wrapper b/scripts/vserver-wrapper
index 2e4df9f..ccbd2e1 100755 (executable)
--- a/scripts/vserver-wrapper
+++ b/scripts/vserver-wrapper
@@ -29,23 +29,15 @@ test -n "$MARK" || MARK=default
 
 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
@@ -60,7 +52,7 @@ function _tellResult()
 
 function start()
 {
-    _beginResult $"Starting vservers of type '$MARK'..."
+    echo -n $"Starting vservers of type '$MARK'..."
     $_START_VSERVERS -m "$MARK" -j "$NUMPARALLEL" --all --start
     _tellResult $?
     local rc=$?
@@ -70,7 +62,7 @@ function start()
 
 function stop()
 {
-    _beginResult $"Stopping vservers of type '$MARK'..."
+    echo -n $"Stopping vservers of type '$MARK'..."
     $_START_VSERVERS -m "$MARK" -j "$NUMPARALLEL" --all --stop
     _tellResult $?
     local rc=$?