From b406998019b577eac7f758298cc2695372e03d15 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Mon, 2 Jan 2012 13:50:32 -0800 Subject: busybox: rename syslog.conf to syslog-startup.conf Busybox 1.19 introduced basic support for an rsyslog inspired syslog.conf whereas we've been shipping syslog.conf as a file to be sourced by the syslog init script in order to configure which options busybox's syslog is started with. Busybox 1.19 in syslog mode chokes on our syslog.conf and doesn't start. This patch renames the syslog.conf we ship to syslog-startup.conf in order to prevent busybox trying to parse the file as an rsyslog style syslog.conf Fixes [YOCTO #1848] Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/files/syslog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/busybox/files/syslog') diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog index 9edaa1505..5ff6599ee 100644 --- a/meta/recipes-core/busybox/files/syslog +++ b/meta/recipes-core/busybox/files/syslog @@ -10,8 +10,8 @@ set -e -if [ -f /etc/syslog.conf ]; then - . /etc/syslog.conf +if [ -f /etc/syslog-startup.conf ]; then + . /etc/syslog-startup.conf LOG_LOCAL=0 LOG_REMOTE=0 for D in $DESTINATION; do -- cgit v1.2.3