Changeset 29182

Timestamp:

2011-11-16T10:44:31+01:00 (6 years ago)

Author:

nico

Message:

packages/mini_snmpd: use new service functions, various changes:

• changes 'disks' & 'interfaces' options to list
• default 'enabled' to false
• mark '/etc/config/mini_snmpd' as a config file

Location:

packages/net/mini_snmpd

Files:

• Makefile (modified) (2 diffs)
• files/mini_snmpd.config (modified) (1 diff)
• files/mini_snmpd.init (modified) (3 diffs)

packages/net/mini_snmpd/Makefile

@@ -10 +10 @@
 PKG_NAME:=mini_snmpd
 PKG_VERSION:=1.2b
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -55 +55 @@
 endef
 
+define Package/mini-snmpd/conffiles
+/etc/config/mini_snmpd
+endef
+
 $(eval $(call BuildPackage,mini-snmpd))

packages/net/mini_snmpd/files/mini_snmpd.config

@@ -1 +1 @@
 config mini_snmpd
-        option enabled 1
+        option enabled 0
         option ipv6 0
-        option community public
+        option community 'public'
+        option contact ''
         option location ''
-        option contact ''
-        option disks '/tmp,/jffs'
-        option interfaces 'lo,br-lan,eth0.1,eth1' # Max 4
+
+        # enable basic disk usage statistics on specified mountpoint
+        list disks '/jffs'
+        list disks '/tmp'
+
+        # enable basic network statistics on specified interface
+        # 4 interfaces maximum, as named in /etc/config/network
+        list interfaces 'loopback'
+        list interfaces 'lan'
+        list interfaces 'wan'

packages/net/mini_snmpd/files/mini_snmpd.init

@@ -1 +1 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 
-NAME=mini_snmpd
-PROG=/usr/bin/$NAME
 START=50
+
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
+append_disk() {
+        local disk="$1"
+        append disks "$disk" ','
+}
+
+append_interface() {
+        local name="$1"
+        local interface
+        config_get interface "$name" 'ifname'
+        append interfaces "$interface" ','
+}
 
 append_string() {
@@ -15 +28 @@
 }
 
-mini_snmpd_config() {
+start_instance() {
         local cfg="$1"
-        args=""
+        local args=""
+        local disks=""
+        local interfaces=""
+        local ipv6
 
         append_string "$cfg" community "-c"
         append_string "$cfg" location "-L"
         append_string "$cfg" contact "-C"
-        append_string "$cfg" disks "-d"
-        append_string "$cfg" interfaces "-i"
 
         config_get_bool ipv6 "$cfg" "ipv6" '0'
@@ -29 +43 @@
 
         config_get_bool enabled "$cfg" "enabled" '1'
-        [ "$enabled" -gt 0 ] && $PROG $args &
+        [ "$enabled" -gt 0 ] || return 1
+
+        config_list_foreach "$section" 'disks' append_disk
+        args="${args}${disks:+ -d $disks}"
+
+        config_list_foreach "$section" 'interfaces' append_interface
+        args="${args}${interfaces:+ -i $interfaces}"
+
+        service_start /usr/bin/mini_snmpd $args
 }
 
 start() {
-        config_load mini_snmpd
-        config_foreach mini_snmpd_config mini_snmpd
+        include /lib/network
+        scan_interfaces
+        config_load 'mini_snmpd'
+        config_foreach start_instance 'mini_snmpd'
 }
 
 stop() {
-        killall mini_snmpd
+        service_stop /usr/bin/mini_snmpd
 }