- Obsoletes: vserver-distro-ubuntu

[packages/util-vserver.git] / vservers.init

diff --git a/vservers.init b/vservers.init
index 0a3156f6bd87ccf35ca22866532f9fb48002c865..7826c864baffcc2aeecd4d071820f19542923ed5 100644 (file)
--- a/vservers.init
+++ b/vservers.init
@@ -41,7 +41,7 @@ _tellResult()
 case "$1" in
 start)
        if [ ! -f /var/lock/subsys/vprocunhide ]; then
-               echo "Run \"/etc/rc.d/init.d/vprocunhide start\" first"
+               echo "Run \"/sbin/service vprocunhide start\" first"
                exit 1
        fi
 
@@ -83,10 +83,14 @@ start)
                rc=$?
                [ $rc -eq 0 ] && touch /var/lock/subsys/vserver-$VSERVER
        done
-       [ $rc -eq 0 ] && touch /var/lock/subsys/vservers-all
+       touch /var/lock/subsys/vservers
        ;;
 stop)
-       for VSERVER in $START_VSERVERS; do
+       __STOP_VSERVERS=
+       for __V in $START_VSERVERS; do
+               __STOP_VSERVERS="$__V $__STOP_VSERVERS"
+       done
+       for VSERVER in $__STOP_VSERVERS; do
                if [ ! -f /var/lock/subsys/vserver-$VSERVER ]; then
                        echo "Vserver '$VSERVER' is not running"
                        continue
@@ -111,7 +115,11 @@ stop)
                        echo "All types of vservers are not running"
                fi
        else
-               for MARK in $MARKS; do
+               __STOP_MARKS=
+               for __V in $MARKS; do
+                       __STOP_MARKS="$__V $__STOP_MARKS"
+               done
+               for MARK in $__STOP_MARKS; do
                        if [ ! -f /var/lock/subsys/vservers-$MARK ]; then
                                echo "Vservers of type '$MARK' are not running"
                                continue
@@ -153,8 +161,8 @@ status)
        /usr/sbin/vserver-stat
        ;;
 *)
-       echo "Usage: $0 {start|stop|status}"
-       exit 1
+       msg_usage "$0 {start|stop|status}"
+       exit 3
        ;;
 esac