From 6c14611b1c908c04982b3434f629f9428b4c540e Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Thu, 27 Nov 2014 17:27:34 +0100
Subject: [PATCH] build: configure snmpd at run-time, not build-time
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
build/scripts/wrs_build_wraprootfs | 8 --------
userspace/rootfs_override/wr/bin/apply_dot-config | 9 ++++++++-
.../rootfs_override/wr/etc/{snmpd.conf => snmpd.conf.in} | 0
3 files changed, 8 insertions(+), 9 deletions(-)
rename userspace/rootfs_override/wr/etc/{snmpd.conf => snmpd.conf.in} (100%)
diff --git a/build/scripts/wrs_build_wraprootfs b/build/scripts/wrs_build_wraprootfs
index 3919d24e0..5f17e661a 100755
--- a/build/scripts/wrs_build_wraprootfs
+++ b/build/scripts/wrs_build_wraprootfs
@@ -47,14 +47,6 @@ rm -rf $TMPFS/dev
(cd $TMPFS && tar xzf $DEVTAR)
(cd $TMPFS && ln -fs sbin/init .)
-# Fix SNMP values: for all not-empty configs remove commend and replace value
-cfgfile="$TMPFS/wr/etc/snmpd.conf"
-set | grep CONFIG_SNMP | sed 's/=/ /' | while read varname value; do
- if [ -z "\$value" ]; then continue; fi
- sed -i "/\$varname/ s/^#//" \$cfgfile
- sed -i "/\$varname/ s/\$varname/\$value/" \$cfgfile
-done
-
# Fix log values
cfgfile="$TMPFS/wr/sbin/start-daemons.sh"
set | grep CONFIG_WRS_LOG | sed 's/=/ /' | while read varname value; do
diff --git a/userspace/rootfs_override/wr/bin/apply_dot-config b/userspace/rootfs_override/wr/bin/apply_dot-config
index 9d667b260..bdd2f603d 100755
--- a/userspace/rootfs_override/wr/bin/apply_dot-config
+++ b/userspace/rootfs_override/wr/bin/apply_dot-config
@@ -58,4 +58,11 @@ if [ ! -z "$CONFIG_REMOTE_SYSLOG_SERVER" ]; then
fi
copy_conf /etc/rsyslog.conf /usr/etc/rsyslog.conf
-
+# Fix SNMP values: for all not-empty configs remove comment and replace value
+cp /wr/etc/snmpd.conf.in $T
+set | grep CONFIG_SNMP | sed 's/=/ /' | while read varname value; do
+ if [ -z "$value" ]; then continue; fi
+ sed -i "/$varname/ s/^#//" $T
+ sed -i "/$varname/ s/$varname/$value/" $T
+done
+copy_conf /wr/etc/snmpd.conf
diff --git a/userspace/rootfs_override/wr/etc/snmpd.conf b/userspace/rootfs_override/wr/etc/snmpd.conf.in
similarity index 100%
rename from userspace/rootfs_override/wr/etc/snmpd.conf
rename to userspace/rootfs_override/wr/etc/snmpd.conf.in
--
GitLab