netsnmp: add global enabled config option

Add enabled config option in the global uci section; it allows to put into
place the snmpd config but not yet start the netsnmp daemon.
If config option is unset; netsnmp daemon will be started as before.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 856238eef1c040a2b8c9230742d54b282c3591c8..01f2265284eb85e3f447dc401a304b37be2d29b6 100644 (file)
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=net-snmp
 PKG_VERSION:=5.7.3
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/net-snmp

diff --git a/net/net-snmp/files/snmpd.conf b/net/net-snmp/files/snmpd.conf
index f3b925937ced6f62d8b54f6c0da0af35415da6e0..cf3f95cfecce8fc0b9f45c2e31aeb6b2552f7463 100644 (file)
--- a/net/net-snmp/files/snmpd.conf
+++ b/net/net-snmp/files/snmpd.conf
@@ -116,4 +116,5 @@ config engineid
 #      option trapsess '-v 3 -e 0x80001f88808c18d3f7b0000 -u trapuser -a MD5 -A administrator -l authPriv -x DES -X rootpasswd udp:127.0.0.1:162'
 
 config snmpd general
+       option enabled '1'
 #      list network 'wan'

diff --git a/net/net-snmp/files/snmpd.init b/net/net-snmp/files/snmpd.init
index 0be8511ba3347a2834ff3e37a93c150ba87fb906..caffecf6640778f22d6f0742e6f56b73a04c9721 100644 (file)
--- a/net/net-snmp/files/snmpd.init
+++ b/net/net-snmp/files/snmpd.init
@@ -272,10 +272,13 @@ snmpd_setup_fw_rules() {
 start_service() {
        [ -f "$CONFIGFILE" ] && rm -f "$CONFIGFILE"
 
-       procd_open_instance
-
        config_load snmpd
 
+       config_get_bool snmp_enabled general enabled 1
+       [ "$snmp_enabled" -eq 0 ] && return
+
+       procd_open_instance
+
        config_foreach snmpd_agent_add agent
        config_foreach snmpd_agentx_add agentx
        config_foreach snmpd_system_add system