net-snmp: set hostname as sysname

This commit writes the option hostname obtained via uci_get
system.@system[0].hostname to the snmpd.conf file if sysName
is not defined in /etc/config/snmpd.

Signed-off-by: Christian Korber <ckorber@tdt.de>

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 68eb9abbd0115b4732e65d7dd54174977ae3d683..6d4a55ed36a1b90f30def25a4b1424bd32001c97 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.9.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/net-snmp

diff --git a/net/net-snmp/files/snmpd.init b/net/net-snmp/files/snmpd.init
index daecb73c9a66f67de713c697cbf90b467099daf5..0fbf575aa803ed318c15a6a8a41b96518e0e1251 100644 (file)
--- a/net/net-snmp/files/snmpd.init
+++ b/net/net-snmp/files/snmpd.init
@@ -24,12 +24,15 @@ snmpd_agentx_add() {
 
 snmpd_system_add() {
        local cfg="$1"
+       local hostname
+
        config_get syslocation "$cfg" sysLocation
        [ -n "$syslocation" ] && echo "sysLocation $syslocation" >> $CONFIGFILE
        config_get syscontact "$cfg" sysContact
        [ -n "$syscontact" ] && echo "sysContact $syscontact" >> $CONFIGFILE
        config_get sysname "$cfg" sysName
        [ -n "$sysname" ] && echo "sysName $sysname" >> $CONFIGFILE
+       [ -z "$sysname" ] && hostname=$(uci_get system.@system[0].hostname) && echo "sysName $hostname" >> $CONFIGFILE
        config_get sysservice "$cfg" sysService
        [ -n "$sysservice" ] && echo "sysService $sysservice" >> $CONFIGFILE
        config_get sysdescr "$cfg" sysDescr