net-snmp: remove /etc/default/snmpd Debianism

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 6fbf1b8bdef567ade8918762e24fb0c64a555b05..5736e0d7d4cc7b87954234b56c47378902ec2c7f 100644 (file)
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -216,7 +216,6 @@ define Package/libnetsnmp/install
 endef
 
 define Package/snmpd/conffiles
-/etc/default/snmpd
 /etc/config/snmpd
 endef
 
@@ -225,8 +224,6 @@ define Package/snmpd/install
        $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
        $(INSTALL_DIR) $(1)/etc/snmp
        ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
-       $(INSTALL_DIR) $(1)/etc/default
-       $(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/snmpd.init $(1)/etc/init.d/snmpd
        $(INSTALL_DIR) $(1)/usr/sbin
@@ -234,7 +231,6 @@ define Package/snmpd/install
 endef
 
 define Package/snmpd-static/conffiles
-/etc/default/snmpd
 /etc/config/snmpd
 endef
 
@@ -243,8 +239,6 @@ define Package/snmpd-static/install
        $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
        $(INSTALL_DIR) $(1)/etc/snmp
        ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
-       $(INSTALL_DIR) $(1)/etc/default
-       $(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/snmpd.init $(1)/etc/init.d/snmpd
        $(INSTALL_DIR) $(1)/usr/sbin

diff --git a/net/net-snmp/files/snmpd.default b/net/net-snmp/files/snmpd.default
deleted file mode 100644 (file)
index 758c8e4..0000000
--- a/net/net-snmp/files/snmpd.default
+++ /dev/null
@@ -1 +0,0 @@
-OPTIONS="-Lf /dev/null -p /var/run/snmpd.pid"

diff --git a/net/net-snmp/files/snmpd.init b/net/net-snmp/files/snmpd.init
index 2668b7b3e5dd457b7e3527e7347adbf3b4f53d68..bde785a5bd27a0f91bcda87573bc685eac836d96 100644 (file)
--- a/net/net-snmp/files/snmpd.init
+++ b/net/net-snmp/files/snmpd.init
@@ -2,7 +2,7 @@
 # Copyright (C) 2008 OpenWrt.org
 START=50
 
-DEFAULT=/etc/default/snmpd
+OPTIONS="-Lf /dev/null -p /var/run/snmpd.pid"
 LIB_D=/var/lib/snmp
 LOG_D=/var/log
 RUN_D=/var/run
@@ -148,7 +148,6 @@ start() {
        config_foreach snmpd_exec_add exec
        config_foreach snmpd_disk_add disk
        
-       [ -f $DEFAULT ] && . $DEFAULT
        $DEBUG /usr/sbin/snmpd $OPTIONS
 }
 stop() {