net-snmp: cosmetic changes in snmpd init script

- Refactor RUN_C into CONFIGFILE, as used in dnsmasq and igmpproxy init
  scripts.
- Add a newline after each function definition.

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

diff --git a/net/net-snmp/files/snmpd.init b/net/net-snmp/files/snmpd.init
index 24488e7a52293ced34e5b0aaeaf8646a273109b4..a261447668178dc1a3246ad7eb102b1600e6e942 100644 (file)
--- a/net/net-snmp/files/snmpd.init
+++ b/net/net-snmp/files/snmpd.init
@@ -5,30 +5,32 @@ START=50
 USE_PROCD=1
 PROG="/usr/sbin/snmpd"
 
-RUN_C="/var/run/snmpd.conf"
+CONFIGFILE="/var/run/snmpd.conf"
 
 snmpd_agent_add() {
        local cfg="$1"
 
        config_get agentaddress "$cfg" agentaddress
        [ -n "$agentaddress" ] || return 0
-       echo "agentaddress $agentaddress" >> $RUN_C
+       echo "agentaddress $agentaddress" >> $CONFIGFILE
 }
+
 snmpd_system_add() {
        local cfg="$1"
        config_get syslocation "$cfg" sysLocation
-       [ -n "$syslocation" ] && echo "sysLocation $syslocation" >> $RUN_C
+       [ -n "$syslocation" ] && echo "sysLocation $syslocation" >> $CONFIGFILE
        config_get syscontact "$cfg" sysContact
-       [ -n "$syscontact" ] && echo "sysContact $syscontact" >> $RUN_C
+       [ -n "$syscontact" ] && echo "sysContact $syscontact" >> $CONFIGFILE
        config_get sysname "$cfg" sysName
-       [ -n "$sysname" ] && echo "sysName $sysname" >> $RUN_C
+       [ -n "$sysname" ] && echo "sysName $sysname" >> $CONFIGFILE
        config_get sysservice "$cfg" sysService
-       [ -n "$sysservice" ] && echo "sysService $sysservice" >> $RUN_C
+       [ -n "$sysservice" ] && echo "sysService $sysservice" >> $CONFIGFILE
        config_get sysdescr "$cfg" sysDescr
-       [ -n "$sysdescr" ] && echo "sysDescr $sysdescr" >> $RUN_C
+       [ -n "$sysdescr" ] && echo "sysDescr $sysdescr" >> $CONFIGFILE
        config_get sysobjectid "$cfg" sysObjectID
-       [ -n "$sysobjectid" ] && echo "sysObjectID $sysobjectid" >> $RUN_C
+       [ -n "$sysobjectid" ] && echo "sysObjectID $sysobjectid" >> $CONFIGFILE
 }
+
 snmpd_com2sec_add() {
        local cfg="$1"
        config_get secname "$cfg" secname
@@ -37,8 +39,9 @@ snmpd_com2sec_add() {
        [ -n "$source" ] || return 0
        config_get community "$cfg" community
        [ -n "$community" ] || return 0
-       echo "com2sec $secname $source $community" >> $RUN_C
+       echo "com2sec $secname $source $community" >> $CONFIGFILE
 }
+
 snmpd_com2sec6_add() {
        local cfg="$1"
        config_get secname "$cfg" secname
@@ -47,8 +50,9 @@ snmpd_com2sec6_add() {
        [ -n "$source" ] || return 0
        config_get community "$cfg" community
        [ -n "$community" ] || return 0
-       echo "com2sec6 $secname $source $community" >> $RUN_C
+       echo "com2sec6 $secname $source $community" >> $CONFIGFILE
 }
+
 snmpd_group_add() {
        local cfg="$1"
        config_get group "$cfg" group
@@ -57,8 +61,9 @@ snmpd_group_add() {
        [ -n "$version" ] || return 0
        config_get secname "$cfg" secname
        [ -n "$secname" ] || return 0
-       echo "group $group $version $secname" >> $RUN_C
+       echo "group $group $version $secname" >> $CONFIGFILE
 }
+
 snmpd_view_add() {
        local cfg="$1"
        config_get viewname "$cfg" viewname
@@ -69,8 +74,9 @@ snmpd_view_add() {
        [ -n "$oid" ] || return 0
        # optional mask
        config_get mask "$cfg" mask
-       echo "view $viewname $type $oid $mask" >> $RUN_C
+       echo "view $viewname $type $oid $mask" >> $CONFIGFILE
 }
+
 snmpd_access_add() {
        local cfg="$1"
        config_get group "$cfg" group
@@ -90,8 +96,9 @@ snmpd_access_add() {
        [ -n "$write" ] || return 0
        config_get notify "$cfg" notify
        [ -n "$notify" ] || return 0
-       echo "access $group $context $version $level $prefix $read $write $notify" >> $RUN_C
+       echo "access $group $context $version $level $prefix $read $write $notify" >> $CONFIGFILE
 }
+
 snmpd_pass_add() {
        local cfg="$1"
        local pass='pass'
@@ -104,8 +111,9 @@ snmpd_pass_add() {
        [ $persist -ne 0 ] && pass='pass_persist'
        config_get priority "$cfg" priority
        priority=${priority:+-p $priority}
-       echo "$pass $priority $miboid $prog" >> $RUN_C
+       echo "$pass $priority $miboid $prog" >> $CONFIGFILE
 }
+
 snmpd_exec_add() {
        local cfg="$1"
 
@@ -115,8 +123,9 @@ snmpd_exec_add() {
        [ -n "$prog" ] || return 0
        config_get args "$cfg" args
        config_get miboid "$cfg" miboid
-       echo "exec $miboid $name $prog $args" >> $RUN_C
+       echo "exec $miboid $name $prog $args" >> $CONFIGFILE
 }
+
 snmpd_disk_add() {
         local cfg="$1"
         local disk='disk'
@@ -125,11 +134,11 @@ snmpd_disk_add() {
         [ -n "$partition" ] || return 0
         config_get size "$cfg" size
         [ -n "$size" ] || return 0
-        echo "$disk $partition $size" >> $RUN_C
+        echo "$disk $partition $size" >> $CONFIGFILE
 }
 
 start_service() {
-       [ -f "$RUN_C" ] && rm -f "$RUN_C"
+       [ -f "$CONFIGFILE" ] && rm -f "$CONFIGFILE"
 
        procd_open_instance
 
@@ -147,12 +156,12 @@ start_service() {
        config_foreach snmpd_disk_add disk
        
        procd_set_param command $PROG -Lf /dev/null -f
-       procd_set_param file $RUN_C
+       procd_set_param file $CONFIGFILE
        procd_set_param respawn
 
        procd_close_instance
 }
 
 stop_service() {
-       [ -f "$RUN_C" ] && rm -f "$RUN_C"
+       [ -f "$CONFIGFILE" ] && rm -f "$CONFIGFILE"
 }