diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2012-01-02 13:50:32 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:02:36 +0000 |
| commit | b406998019b577eac7f758298cc2695372e03d15 (patch) | |
| tree | 19007d6d8d50eb635eb18906805f33c35ee48369 /meta/recipes-core/busybox/files | |
| parent | e5def5f36619c8f78fbb82f106f1ab7aab607532 (diff) | |
| download | openembedded-core-contrib-b406998019b577eac7f758298cc2695372e03d15.tar.gz | |
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 <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/files')
| -rw-r--r-- | meta/recipes-core/busybox/files/syslog | 4 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/files/syslog-startup.conf (renamed from meta/recipes-core/busybox/files/syslog.conf) | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog index 9edaa15053..5ff6599ee8 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 diff --git a/meta/recipes-core/busybox/files/syslog.conf b/meta/recipes-core/busybox/files/syslog-startup.conf index d4a0e02f5b..903a60ce8b 100644 --- a/meta/recipes-core/busybox/files/syslog.conf +++ b/meta/recipes-core/busybox/files/syslog-startup.conf @@ -1,5 +1,8 @@ -DESTINATION="buffer" # log destinations (buffer file remote) -MARKINT=20 # intervall between --mark-- entries +# This configuration file is used by the busybox syslog init script, +# /etc/init.d/syslog[.busybox] to set syslog configuration at start time. + +DESTINATION=buffer # log destinations (buffer file remote) +MARKINT=20 # interval between --mark-- entries LOGFILE=/var/log/messages # where to log (file) REMOTE=loghost:514 # where to log (syslog remote) REDUCE=no # reduce-size logging |