[Pkg-net-snmp-commits] r133 - branches/net-snmp53/debian trunk/debian

[Jochen Friedrich]

Author: jochen
Date: 2007-01-10 17:00:47 +0100 (Wed, 10 Jan 2007)
New Revision: 133

Modified:
   branches/net-snmp53/debian/snmpd.init
   trunk/debian/snmpd.init
Log:
Sync startup files.


Modified: branches/net-snmp53/debian/snmpd.init
===================================================================
--- branches/net-snmp53/debian/snmpd.init	2007-01-10 15:58:19 UTC (rev 132)
+++ branches/net-snmp53/debian/snmpd.init	2007-01-10 16:00:47 UTC (rev 133)
@@ -52,10 +52,10 @@
     echo -n " snmptrapd"
     echo "."
     ;;
-  restart|reload|force-reload)
+  restart)
     echo -n "Restarting network management services:"
-    start-stop-daemon --quiet --stop --exec /usr/sbin/snmpd
-    start-stop-daemon --quiet --stop --exec /usr/sbin/snmptrapd
+    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd
+    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd
     # Allow the daemons time to exit completely.
     sleep 2
     if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
@@ -70,6 +70,15 @@
     fi
     echo "."
     ;;
+  reload|force-reload)
+    echo -n "Reloading network management services:"
+    if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
+        start-stop-daemon --quiet --stop --signal 1 \
+	    --pidfile /var/run/snmpd.pid --exec /usr/sbin/snmpd
+	echo -n " snmpd"
+    fi
+    echo "."
+    ;;
   *)
     echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload}"
     exit 1

Modified: trunk/debian/snmpd.init
===================================================================
--- trunk/debian/snmpd.init	2007-01-10 15:58:19 UTC (rev 132)
+++ trunk/debian/snmpd.init	2007-01-10 16:00:47 UTC (rev 133)
@@ -52,10 +52,10 @@
     echo -n " snmptrapd"
     echo "."
     ;;
-  restart|reload|force-reload)
+  restart)
     echo -n "Restarting network management services:"
-    start-stop-daemon --quiet --stop --exec /usr/sbin/snmpd
-    start-stop-daemon --quiet --stop --exec /usr/sbin/snmptrapd
+    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd
+    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd
     # Allow the daemons time to exit completely.
     sleep 2
     if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
@@ -70,6 +70,15 @@
     fi
     echo "."
     ;;
+  reload|force-reload)
+    echo -n "Reloading network management services:"
+    if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
+        start-stop-daemon --quiet --stop --signal 1 \
+	    --pidfile /var/run/snmpd.pid --exec /usr/sbin/snmpd
+	echo -n " snmpd"
+    fi
+    echo "."
+    ;;
   *)
     echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload}"
     exit 1