[Pkg-net-snmp-commits] [pkg-net-snmp] 04/06: fix bug#525028

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch master
in repository pkg-net-snmp.

commit ba74b3a814c03909d31f41db1730c8d779c6476f
Author: Hideki Yamane <henrich at debian.org>
Date:   Wed Apr 9 21:47:38 2014 +0900

    fix bug#525028
---
 debian/changelog      | 7 +++++++
 debian/snmptrapd.init | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a3556d..2b454b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+net-snmp (5.7.2.1~dfsg-3) UNRELEASED; urgency=medium
+
+  * debian/snmptrapd.init
+    - fix "--force-reload" option (Closes: #525028)
+
+ -- Hideki Yamane <henrich at debian.org>  Wed, 09 Apr 2014 21:47:01 +0900
+
 net-snmp (5.7.2.1~dfsg-2) experimental; urgency=medium
 
   * fix broken debian/snmpd.postinst
diff --git a/debian/snmptrapd.init b/debian/snmptrapd.init
index f426e13..e70aee9 100644
--- a/debian/snmptrapd.init
+++ b/debian/snmptrapd.init
@@ -17,7 +17,6 @@ set -e
 . /lib/lsb/init-functions
 
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin
-test -x /usr/sbin/snmpd || exit 0
 test -x /usr/sbin/snmptrapd || exit 0
 
 # Defaults
@@ -63,7 +62,7 @@ case "$1" in
     log_daemon_msg "Reloading SNMP trap services:"
     if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then
         start-stop-daemon --quiet --stop --signal 1 \
-           --pidfile "$TRAPD_PID" --exec /usr/sbin/snmpd
+           --pidfile "$TRAPD_PID" --exec /usr/sbin/snmptrapd
         log_progress_msg " snmptrapd"
     fi
     ;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-net-snmp/pkg-net-snmp.git