[Pkg-net-snmp-commits] [SCM] Git repository for pkg-net-snmp branch, master, updated. debian/5.7.2_dfsg-5-5-g9c97387

[Hideki Yamane]

The following commit has been merged in the master branch:
commit 9e4675a535c538ce2a244a13803413868e6668ee
Author: Hideki Yamane <henrich at debian.org>
Date:   Mon May 20 07:18:58 2013 +0900

    debian/snmpd.init: patch from Ubuntu

diff --git a/debian/changelog b/debian/changelog
index d0bb4c6..14ae08a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ net-snmp (5.7.2~dfsg-6) UNRELEASED; urgency=low
   * debian/rules
     - Fix Hurd build issue, thanks Pino Toscano <pino at debian.org> for
       the patch (Closes: #708951)
+  * debian/snmpd.init
+    - patch from Ubuntu, LSBified
 
  -- Hideki Yamane <henrich at debian.org>  Mon, 20 May 2013 06:50:27 +0900
 
diff --git a/debian/snmpd.init b/debian/snmpd.init
index dc11bea..e5bc6a6 100644
--- a/debian/snmpd.init
+++ b/debian/snmpd.init
@@ -40,7 +40,7 @@ cd /
 
 case "$1" in
   start)
-    echo -n "Starting network management services:"
+    log_daemon_msg "Starting network management services:"
     # remove old symlink with previous version
     if [ -L /var/run/agentx ]; then
 	    rm -f /var/run/agentx
@@ -51,49 +51,45 @@ case "$1" in
     if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
 	start-stop-daemon --quiet --start --oknodo --exec /usr/sbin/snmpd \
 	    -- $SNMPDOPTS
-	echo -n " snmpd"
+	log_progress_msg " snmpd"
     fi
     if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then
 	start-stop-daemon --quiet --start --oknodo --exec /usr/sbin/snmptrapd \
 	    -- $TRAPDOPTS
-	echo -n " snmptrapd"
+	log_progress_msg " snmptrapd"
     fi
-    echo "."
     ;;
   stop)
-    echo -n "Stopping network management services:"
+    log_daemon_msg "Stopping network management services:"
     start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd && [ ! -f $SNMP_PID ] || rm $SNMP_PID
-    echo -n " snmpd"
+    log_progress_msg " snmpd"
     start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd && [ ! -f $TRAPD_PID ] || rm $TRAPD_PID
-    echo -n " snmptrapd"
-    echo "."
+    log_progress_msg " snmptrapd"
     ;;
   restart)
-    echo -n "Restarting network management services:"
+    log_daemon_msg "Restarting network management services:"
     start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd  && [ ! -f $SNMP_PID ] || rm $SNMP_PID
     start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd  && [ ! -f $TRAPD_PID ] || rm $TRAPD_PID
     # Allow the daemons time to exit completely.
     sleep 2
     if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
 	start-stop-daemon --quiet --start --exec /usr/sbin/snmpd -- $SNMPDOPTS
-	echo -n " snmpd"
+	log_progress_msg " snmpd"
     fi
     if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then
 	# Allow snmpd time to start up.
 	sleep 1
 	start-stop-daemon --quiet --start --exec /usr/sbin/snmptrapd -- $TRAPDOPTS
-	echo -n " snmptrapd"
+	log_progress_msg " snmptrapd"
     fi
-    echo "."
     ;;
   reload|force-reload)
-    echo -n "Reloading network management services:"
+    log_daemon_msg "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"
+	log_progress_msg " snmpd"
     fi
-    echo "."
     ;;
   status)
     status=0

-- 
Git repository for pkg-net-snmp