- fix sysctl location

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

diff --git a/vservers.init b/vservers.init
old mode 100644 (file)
new mode 100755 (executable)
index 1745295..0c0a60b
--- a/vservers.init
+++ b/vservers.init
@@ -7,14 +7,14 @@
 #              This script does not care for vservers not started by it
 #
 # Copyright 1999-2004 Gentoo Foundation
-# Modified for PLD by Jan Rêkorajski <baggins@pld-linux.org>
+# Modified for PLD by Jan Rękorajski <baggins@pld-linux.org>
 # Distributed under the terms of the GNU General Public License v2
 #
 
 # Source function library
 . /etc/rc.d/init.d/functions
 
-[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
+[ -n "$UTIL_VSERVER_VARS" ] || UTIL_VSERVER_VARS=/usr/share/util-vserver/util-vserver-vars
 if [ ! -e "$UTIL_VSERVER_VARS" ] ; then
        echo "Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
        exit 1
@@ -23,7 +23,6 @@ fi
 
 [ -f /etc/sysconfig/vservers ] && . /etc/sysconfig/vservers
 
-[ -n "$MARKS" ] || MARKS="default"
 [ -n "$NUMPARALLEL" ] || NUMPARALLEL=1
 [ -n "$LOCKDIR" ] || LOCKDIR="/var/lock/vservers"
 
@@ -42,11 +41,11 @@ _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
 
-       if [ is_yes "$STARTALL" ]; then
+       if is_yes "$STARTALL"; then
                if [ ! -f /var/lock/subsys/vservers-all ]; then
                        show "Starting all types of vservers"
                        busy
@@ -84,9 +83,14 @@ start)
                rc=$?
                [ $rc -eq 0 ] && touch /var/lock/subsys/vserver-$VSERVER
        done
+       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
@@ -99,7 +103,7 @@ stop)
                rm -f /var/lock/subsys/vserver-$VSERVER
        done
 
-       if [ is_yes "$STARTALL" ]; then
+       if is_yes "$STARTALL"; then
                if [ -f /var/lock/subsys/vservers-all ]; then
                        show "Stopping all types of vservers"
                        busy
@@ -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
@@ -124,6 +132,7 @@ stop)
                        rm -f /var/lock/subsys/vservers-$MARK
                done
        fi
+       rm -f /var/lock/subsys/vservers
        ;;
 status)
        echo "The following types of vservers are running:"
@@ -131,7 +140,7 @@ status)
        for i in /var/lock/subsys/vservers-*; do
                [ -f "$i" ] || continue
                echo $i | awk '{gsub("/var/lock/subsys/vservers-",""); printf(" %s\n",$0); }'
-               local running="true"
+               running="true"
        done
 
        if [[ "${running}" != "true" ]]; then
@@ -152,8 +161,8 @@ status)
        /usr/sbin/vserver-stat
        ;;
 *)
-       echo "Usage: $0 {start|stop|restart|status}"
-       exit 1
+       msg_usage "$0 {start|stop|status}"
+       exit 3
        ;;
 esac