diff options
Diffstat (limited to 'debian/snmpd.init')
| -rw-r--r-- | debian/snmpd.init | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/debian/snmpd.init b/debian/snmpd.init index e5bc6a6..3e6dc03 100644 --- a/debian/snmpd.init +++ b/debian/snmpd.init @@ -1,6 +1,6 @@ -#! /bin/sh -e +#! /bin/sh ### BEGIN INIT INFO -# Provides: snmpd snmptrapd +# Provides: snmpd # Required-Start: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog # Default-Start: 2 3 4 5 @@ -18,7 +18,6 @@ set -e export PATH=/sbin:/usr/sbin:/bin:/usr/bin test -x /usr/sbin/snmpd || exit 0 -test -x /usr/sbin/snmptrapd || exit 0 # Defaults OLD_MIBS_DIR="/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" @@ -26,11 +25,8 @@ MIBS_DIR="/usr/share/snmp/mibs:/usr/share/snmp/mibs/iana:/usr/share/snmp/mibs/ie export MIBDIRS="$MIBS_DIR:$OLD_MIBS_DIR" SNMP_PID="/run/snmpd.pid" -TRAPD_PID="/run/snmptrapd.pid" SNMPDRUN="yes" SNMPDOPTS="-Lsd -Lf /dev/null -p $SNMP_PID" -TRAPDRUN=no -TRAPDOPTS="-Lsd -p $TRAPD_PID" # Reads config file (will override defaults above) [ -r /etc/default/snmpd ] && . /etc/default/snmpd @@ -40,7 +36,7 @@ cd / case "$1" in start) - log_daemon_msg "Starting network management services:" + log_daemon_msg "Starting SNMP services:" # remove old symlink with previous version if [ -L /var/run/agentx ]; then rm -f /var/run/agentx @@ -53,41 +49,25 @@ case "$1" in -- $SNMPDOPTS 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 - log_progress_msg " snmptrapd" - fi ;; stop) - log_daemon_msg "Stopping network management services:" - start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd && [ ! -f $SNMP_PID ] || rm $SNMP_PID + log_daemon_msg "Stopping SNMP services:" + start-stop-daemon --quiet --stop --oknodo --retry 3 --exec /usr/sbin/snmpd && [ ! -f $SNMP_PID ] || rm $SNMP_PID log_progress_msg " snmpd" - start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd && [ ! -f $TRAPD_PID ] || rm $TRAPD_PID - log_progress_msg " snmptrapd" ;; restart) - 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 + log_daemon_msg "Restarting SNMP services:" + start-stop-daemon --quiet --stop --oknodo --retry 3 --exec /usr/sbin/snmpd && [ ! -f $SNMP_PID ] || rm $SNMP_PID if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then start-stop-daemon --quiet --start --exec /usr/sbin/snmpd -- $SNMPDOPTS 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 - log_progress_msg " snmptrapd" - fi ;; reload|force-reload) - log_daemon_msg "Reloading network management services:" + log_daemon_msg "Reloading SNMP 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 + --pidfile "$SNMP_PID" --exec /usr/sbin/snmpd log_progress_msg " snmpd" fi ;; @@ -96,9 +76,6 @@ case "$1" in if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then status_of_proc /usr/sbin/snmpd snmpd || status=$? fi - if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then - status_of_proc /usr/sbin/snmptrapd snmptrapd || status=$? - fi exit $status ;; *) |