- use functions

Changed files:
    net-snmpd.init -> 1.14
    net-snmptrapd.init -> 1.9

diff --git a/net-snmpd.init b/net-snmpd.init
index f334d5ad703c07e61481c2a287e2c247b27d89ae..04b31547de646402630f47eb5ddf1ba8bfbf7319 100644 (file)
--- a/net-snmpd.init
+++ b/net-snmpd.init
@@ -37,10 +37,7 @@ else
        exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/snmpd ]; then
                msg_starting "snmpd"
@@ -53,8 +50,9 @@ case "$1" in
        else
                msg_already_running "snmpd"
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/snmpd ]; then
                msg_stopping "snmpd"
                killproc snmpd
@@ -62,6 +60,16 @@ case "$1" in
        else
                msg_not_running "snmpd"
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   reload)
        if [ -f /var/lock/subsys/snmpd ]; then
@@ -72,9 +80,8 @@ case "$1" in
        fi
        ;;
   restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   status)
        status snmpd

diff --git a/net-snmptrapd.init b/net-snmptrapd.init
index a5527881fb14f439903344ac401f5c68465aa220..476867c3f57fce0223cd26e988b2ef3c9176c227 100644 (file)
--- a/net-snmptrapd.init
+++ b/net-snmptrapd.init
@@ -33,10 +33,7 @@ else
        exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/snmptrapd ]; then
                msg_starting "snmptrapd"
@@ -46,8 +43,9 @@ case "$1" in
        else
                msg_already_running "snmptrapd"
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/snmptrapd ]; then
                msg_stopping "snmptrapd"
                killproc snmptrapd
@@ -55,11 +53,20 @@ case "$1" in
        else
                msg_not_running "snmptrapd"
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+       stop
+       start
        ;;
   status)
        status snmptrapd