rootfs: use /etc/snmpd.conf not /wr/etc/snmpd.conf

Keep modified snmpd.conf in /etc not in /wr/etc. There is no need to keep it in the flash instead of ramdisk. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

rootfs: use /etc/snmpd.conf not /wr/etc/snmpd.conf
Keep modified snmpd.conf in /etc not in /wr/etc. There is no need to keep it in the flash instead of ramdisk. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
de79d73e · Adam Wujek · 02bb6153 · de79d73e · de79d73e · de79d73e
Commit de79d73e authored Aug 12, 2016 by Adam Wujek 💬
Showing with 4 additions and 3 deletions

snmpd userspace/rootfs_override/etc/init.d/snmpd +1 -1

functions.php userspace/rootfs_override/var/www/functions.php +2 -1

apply_dot-config userspace/rootfs_override/wr/bin/apply_dot-config +1 -1

No files found.
--- a/userspace/rootfs_override/etc/init.d/snmpd
+++ b/userspace/rootfs_override/etc/init.d/snmpd
 #!/bin/sh

 SNMP_PID=/var/run/snmpd.pid
-SNMP_CONF=/wr/etc/snmpd.conf
+SNMP_CONF=/etc/snmpd.conf
 dotconfig=/wr/etc/dot-config

 start_counter() {

--- a/userspace/rootfs_override/var/www/functions.php
+++ b/userspace/rootfs_override/var/www/functions.php
@@ -2,6 +2,7 @@

 //Global Variables
 $etcdir="/usr/wr/etc/"; //configuration file folder for WRS
+$etcdir_ram="/etc/"; //configuration file folder for WRS in ramdisk
 $snmpconf="snmpd.conf";
 $ppsipreconf="ppsi-pre.conf";
 $sfpdatabaseconf="sfp_database.conf";
@@ -161,7 +162,7 @@ function wrs_main_info(){
 	$SNMP = check_snmp_status() ? '[on] ' : '[off] ';
 	$SNMP_version = '&nbsp;&nbsp;ver. '.
 		shell_exec("snmpd -v | grep version | awk '{print $3}'");
-	$SNMP_port = shell_exec("cat ".$GLOBALS['etcdir']."snmpd.conf |
+	$SNMP_port = shell_exec("cat ".$GLOBALS['etcdir_ram'].$GLOBALS['snmpconf']." |
 		grep agent | cut -d: -f3 | awk '{print $1}'");
 	$NTP = $_SESSION['KCONFIG']["CONFIG_NTP_SERVER"];
 	$Monitor = check_monit_status() ? '[on] ' : '[off] ';

--- a/userspace/rootfs_override/wr/bin/apply_dot-config
+++ b/userspace/rootfs_override/wr/bin/apply_dot-config
@@ -102,7 +102,7 @@ set | tr -d \' | grep CONFIG_SNMP | sed 's/=/ /' | while read varname value; do
    sed -i "/$varname/ s/^#//" $T
    sed -i "/$varname/ s/$varname/$value/" $T
 done
-copy_conf /wr/etc/snmpd.conf
+cp $T /etc/snmpd.conf

 # Select a ppsi configuration file
 if [ "$CONFIG_PTP_PORT_PARAMS" = "y" ]; then