[Pkg-net-snmp-commits] r273 - branches/net-snmp54/debian branches/net-snmp54-dev/debian trunk/debian

Mon Sep 28 17:05:01 UTC 2009

Author: jochen
Date: 2009-09-28 17:05:01 +0000 (Mon, 28 Sep 2009)
New Revision: 273

Modified:
   branches/net-snmp54-dev/debian/control
   branches/net-snmp54-dev/debian/snmpd.init
   branches/net-snmp54/debian/changelog
   branches/net-snmp54/debian/control
   branches/net-snmp54/debian/snmpd.init
   trunk/debian/control
   trunk/debian/snmpd.init
Log:
Apply patch from Peter Eisentraut <petere at debian.org> to support the 
"status" action in the init.d script.



Modified: branches/net-snmp54/debian/changelog
===================================================================

--- branches/net-snmp54/debian/changelog	2009-08-09 11:56:51 UTC (rev 272)
+++ branches/net-snmp54/debian/changelog	2009-09-28 17:05:01 UTC (rev 273)
@@ -22,8 +22,10 @@
     - 03_makefiles.patch: Install Makefile.mib
   * Removed non-free MIBS from distribution (Closes: #498475)
   * Add debug package
+  * Implement "status" action in the init.d script. (Closes: #528107)
+    Thanks to Peter Eisentraut <petere at debian.org> for the patch
 
- -- Jochen Friedrich <jochen at scram.de>  Fri, 31 Jul 2009 16:29:44 +0200
+ -- Jochen Friedrich <jochen at scram.de>  Wed, 23 Sep 2009 19:22:50 +0200
 
 net-snmp (5.4.1~dfsg-12) unstable; urgency=high
 

Modified: branches/net-snmp54/debian/control
===================================================================
--- branches/net-snmp54/debian/control	2009-08-09 11:56:51 UTC (rev 272)
+++ branches/net-snmp54/debian/control	2009-09-28 17:05:01 UTC (rev 273)
@@ -16,7 +16,7 @@
 Architecture: any
 Conflicts: snmp (<<3.6-3), snmptraplogd
 Replaces: snmptraplogd
-Depends: ${shlibs:Depends}, adduser, debconf
+Depends: ${shlibs:Depends}, adduser, debconf, lsb-base (>= 3.2-13)
 Description: SNMP (Simple Network Management Protocol) agents
  The Simple Network Management Protocol (SNMP) provides a framework
  for the exchange of management information between agents (servers)

Modified: branches/net-snmp54/debian/snmpd.init
===================================================================
--- branches/net-snmp54/debian/snmpd.init	2009-08-09 11:56:51 UTC (rev 272)
+++ branches/net-snmp54/debian/snmpd.init	2009-09-28 17:05:01 UTC (rev 273)
@@ -13,6 +13,8 @@
 #
 set -e
 
+. /lib/lsb/init-functions
+
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 test -x /usr/sbin/snmpd || exit 0
@@ -32,7 +34,7 @@
 cd /
 
 # Create compatibility link to old AgentX socket location
-if [ "$SNMPDCOMPAT" = "yes" ]; then
+if [ "$SNMPDCOMPAT" = "yes" ] && [ "$1" != status ]; then
   ln -sf /var/agentx/master /var/run/agentx
 fi
 
@@ -86,8 +88,14 @@
     fi
     echo "."
     ;;
+  status)
+    status=0
+    status_of_proc /usr/sbin/snmpd snmpd || status=$?
+    status_of_proc /usr/sbin/snmptrapd snmptrapd || status=$?
+    exit $status
+    ;;
   *)
-    echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload}"
+    echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload|status}"
     exit 1
 esac
 

Modified: branches/net-snmp54-dev/debian/control
===================================================================
--- branches/net-snmp54-dev/debian/control	2009-08-09 11:56:51 UTC (rev 272)
+++ branches/net-snmp54-dev/debian/control	2009-09-28 17:05:01 UTC (rev 273)
@@ -16,7 +16,7 @@
 Architecture: any
 Conflicts: snmp (<<3.6-3), snmptraplogd
 Replaces: snmptraplogd
-Depends: ${shlibs:Depends}, adduser, debconf
+Depends: ${shlibs:Depends}, adduser, debconf, lsb-base (>= 3.2-13)
 Description: SNMP (Simple Network Management Protocol) agents
  The Simple Network Management Protocol (SNMP) provides a framework
  for the exchange of management information between agents (servers)

Modified: branches/net-snmp54-dev/debian/snmpd.init
===================================================================
--- branches/net-snmp54-dev/debian/snmpd.init	2009-08-09 11:56:51 UTC (rev 272)
+++ branches/net-snmp54-dev/debian/snmpd.init	2009-09-28 17:05:01 UTC (rev 273)
@@ -13,6 +13,8 @@
 #
 set -e
 
+. /lib/lsb/init-functions
+
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 test -x /usr/sbin/snmpd || exit 0
@@ -32,7 +34,7 @@
 cd /
 
 # Create compatibility link to old AgentX socket location
-if [ "$SNMPDCOMPAT" = "yes" ]; then
+if [ "$SNMPDCOMPAT" = "yes" ] && [ "$1" != status ]; then
   ln -sf /var/agentx/master /var/run/agentx
 fi
 
@@ -86,8 +88,14 @@
     fi
     echo "."
     ;;
+  status)
+    status=0
+    status_of_proc /usr/sbin/snmpd snmpd || status=$?
+    status_of_proc /usr/sbin/snmptrapd snmptrapd || status=$?
+    exit $status
+    ;;
   *)
-    echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload}"
+    echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload|status}"
     exit 1
 esac
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-08-09 11:56:51 UTC (rev 272)
+++ trunk/debian/control	2009-09-28 17:05:01 UTC (rev 273)
@@ -16,7 +16,7 @@
 Architecture: any
 Conflicts: snmp (<<3.6-3), snmptraplogd
 Replaces: snmptraplogd
-Depends: ${shlibs:Depends}, adduser, debconf
+Depends: ${shlibs:Depends}, adduser, debconf, lsb-base (>= 3.2-13)
 Description: SNMP (Simple Network Management Protocol) agents
  The Simple Network Management Protocol (SNMP) provides a framework
  for the exchange of management information between agents (servers)

Modified: trunk/debian/snmpd.init
===================================================================
--- trunk/debian/snmpd.init	2009-08-09 11:56:51 UTC (rev 272)
+++ trunk/debian/snmpd.init	2009-09-28 17:05:01 UTC (rev 273)
@@ -13,6 +13,8 @@
 #
 set -e
 
+. /lib/lsb/init-functions
+
 export PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 test -x /usr/sbin/snmpd || exit 0
@@ -31,6 +33,11 @@
 # Cd to / before starting any daemons.
 cd /
 
+# Create compatibility link to old AgentX socket location
+if [ "$SNMPDCOMPAT" = "yes" ] && [ "$1" != status ]; then
+  ln -sf /var/agentx/master /var/run/agentx
+fi
+
 case "$1" in
   start)
     echo -n "Starting network management services:"
@@ -81,8 +88,14 @@
     fi
     echo "."
     ;;
+  status)
+    status=0
+    status_of_proc /usr/sbin/snmpd snmpd || status=$?
+    status_of_proc /usr/sbin/snmptrapd snmptrapd || status=$?
+    exit $status
+    ;;
   *)
-    echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload}"
+    echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload|status}"
     exit 1
 esac
 


