- use functions

Changed files:
    dhcp6c.init -> 1.4
    dhcp6s.init -> 1.5

diff --git a/dhcp6c.init b/dhcp6c.init
index d884188ebdd46afb7e476198d90fcdb15243c63c..0d024c5d1ae017fa64115b13ee8c379e9f473512 100644 (file)
--- a/dhcp6c.init
+++ b/dhcp6c.init
@@ -29,10 +29,7 @@ else
        exit 0
 fi
 
-RETVAL=0
-
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/dhcp6c ]; then
                msg_starting "DHCP6C"
@@ -42,8 +39,9 @@ case "$1" in
        else
                msg_already_running DHCP6C
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/dhcp6c ]; then
                msg_stopping "DHCP6C Server"
                killproc dhcp6c
@@ -51,11 +49,19 @@ case "$1" in
        else
                msg_not_running DHCP6C
        fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart|reload)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   status)
        status dhcp6c

diff --git a/dhcp6s.init b/dhcp6s.init
index 97b64e676eb94e768f51bfdf99df87d5f8d20825..49017dc14bd4c2518f26b7c240f08caf16d4844b 100644 (file)
--- a/dhcp6s.init
+++ b/dhcp6s.init
@@ -30,10 +30,7 @@ else
        exit 0
 fi
 
-RETVAL=0
-
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/dhcp6s ]; then
                msg_starting "DHCP6S"
@@ -43,8 +40,9 @@ case "$1" in
        else
                msg_already_running DHCP6S
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/dhcp6s ]; then
                msg_stopping "DHCP6S Server"
                killproc dhcp6s
@@ -52,11 +50,19 @@ case "$1" in
        else
                msg_not_running DHCP6S
        fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart|reload)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   status)
        status dhcp6s