From 9ff4f969dc7440746c5654467ff87cf7e28faa00 Mon Sep 17 00:00:00 2001
From: Adam Wujek <adam.wujek@cern.ch>
Date: Fri, 12 Aug 2016 13:43:01 +0200
Subject: [PATCH] rootfs: move rsyslog.conf.in from etc/ to wr/etc/
don't copy rsyslog.conf to the flash
Copying rsyslog.conf to the /usr/etc/rsyslog.conf didn't work anyway because
of the bug in the function copy_conf
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
---
userspace/rootfs_override/wr/bin/apply_dot-config | 4 ++--
userspace/rootfs_override/{ => wr}/etc/rsyslog.conf.in | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename userspace/rootfs_override/{ => wr}/etc/rsyslog.conf.in (100%)
diff --git a/userspace/rootfs_override/wr/bin/apply_dot-config b/userspace/rootfs_override/wr/bin/apply_dot-config
index 115d8d9a4..5e00f0a25 100755
--- a/userspace/rootfs_override/wr/bin/apply_dot-config
+++ b/userspace/rootfs_override/wr/bin/apply_dot-config
@@ -85,7 +85,7 @@ fi
copy_conf /etc/resolv.conf /usr/etc/resolv.conf
# rsyslog.conf is created from a template file, and busybox sed has -i
-cp /usr/etc/rsyslog.conf.in $T
+cp /wr/etc/rsyslog.conf.in $T
if [ "$CONFIG_REMOTE_SYSLOG_UDP" = "y" ]; then
sed -i 's/@@remote-host/@remote-host/' $T
fi
@@ -93,7 +93,7 @@ if [ ! -z "$CONFIG_REMOTE_SYSLOG_SERVER" ]; then
sed -i '/remote-host/ s/^##//' $T
sed -i "s/remote-host/$CONFIG_REMOTE_SYSLOG_SERVER/" $T
fi
-copy_conf /etc/rsyslog.conf /usr/etc/rsyslog.conf
+cp $T /etc/rsyslog.conf
# Fix SNMP values: for all not-empty configs remove comment and replace value
cp /wr/etc/snmpd.conf.in $T
diff --git a/userspace/rootfs_override/etc/rsyslog.conf.in b/userspace/rootfs_override/wr/etc/rsyslog.conf.in
similarity index 100%
rename from userspace/rootfs_override/etc/rsyslog.conf.in
rename to userspace/rootfs_override/wr/etc/rsyslog.conf.in
--
GitLab