- use functions

Changed files:
    rawdevices.init -> 1.6
    util-linux-blockdev.init -> 1.5

diff --git a/rawdevices.init b/rawdevices.init
index b05680665c4704f9b4960561f863a6d2df7b6689..739ec4c4bd032c891ddcf876dd6c629fbc553763 100644 (file)
--- a/rawdevices.init
+++ b/rawdevices.init
@@ -50,10 +50,7 @@ function assign_raw()
        done
 }
 
-
-# See how we were called.
-case "$1" in
-  start|reload)
+start() {
        if [ ! -f /var/lock/subsys/rawdevices ]; then
                msg_starting rawdevices
                ok
@@ -62,8 +59,9 @@ case "$1" in
        else
                msg_already_running rawdevices
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/rawdevices ]; then
                msg_stopping rawdevices
                busy
@@ -72,10 +70,19 @@ case "$1" in
        else
                msg_not_running rawdevices
        fi
+}
+
+# See how we were called.
+case "$1" in
+  start|reload)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
-       ID=`id -u`
-       if [ $ID -eq 0 ]; then
+       id=`id -u`
+       if [ "$id" -eq 0 ]; then
                raw -qa
        else
                # don't remove the space at the end!!!
@@ -83,8 +90,8 @@ case "$1" in
        fi
        ;;
   restart|force-reload)
-       $0 stop
-       $0 start
+       stop
+       start
        ;;
 
   *)

diff --git a/util-linux-blockdev.init b/util-linux-blockdev.init
index 1655033903be76e1dda1acf81d8ec1d88a4261c2..cee0a6cdfa5670f4ba38728d37e1887c37cb62b9 100644 (file)
--- a/util-linux-blockdev.init
+++ b/util-linux-blockdev.init
@@ -15,13 +15,8 @@
 # Source blockdev configureation.
 [ -f /etc/sysconfig/blockdev ] && . /etc/sysconfig/blockdev
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-       start)
-       # Start daemons.
+start() {
        if [ ! -f /var/lock/subsys/blockdev ]; then
-
                for drive in $(ls /sys/block 2> /dev/null); do
                        if [ -d "/sys/block/${drive}" -a -e "/dev/${drive}" ]; then
                                eval PARAMS=\$BLOCKDEV_${drive}
@@ -38,28 +33,34 @@ case "$1" in
        else
                msg_already_running blockdev
        fi
-       ;;
-       stop)
+}
+
+stop() {
        # Stop daemons.
        if [ ! -f /var/lock/subsys/blockdev ]; then
                msg_not_running blockdev
        fi
        rm -f /var/lock/subsys/blockdev
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
        ;;
-       restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  stop)
+       stop
+       ;;
+  restart|force-reload)
+       stop
+       start
        ;;
-       status)
+  status)
        status blockdev
        exit $?
        ;;
-       #  reload)
-       #       msg_reloading blockdev
-       #       killproc blockdev -HUP
-       #       ;;
-       *)
+  *)
        msg_usage "$0 {start|stop|restart|force-reload|status}"
        exit 3
 esac