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:44 +0000 |
commit | 120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4 (patch) | |
tree | a55f74cb16fb6bc441a4b8f681bcb0688b20ce09 /meta/recipes-core/busybox/files/syslog-startup.conf | |
parent | 93855361b76565bef7b8cc5b474a51b20b328464 (diff) | |
download | poky-120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4.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]
(From OE-Core rev: b406998019b577eac7f758298cc2695372e03d15)
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/syslog-startup.conf')
-rw-r--r-- | meta/recipes-core/busybox/files/syslog-startup.conf | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf new file mode 100644 index 0000000000..903a60ce8b --- /dev/null +++ b/meta/recipes-core/busybox/files/syslog-startup.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | # This configuration file is used by the busybox syslog init script, | ||
2 | # /etc/init.d/syslog[.busybox] to set syslog configuration at start time. | ||
3 | |||
4 | DESTINATION=buffer # log destinations (buffer file remote) | ||
5 | MARKINT=20 # interval between --mark-- entries | ||
6 | LOGFILE=/var/log/messages # where to log (file) | ||
7 | REMOTE=loghost:514 # where to log (syslog remote) | ||
8 | REDUCE=no # reduce-size logging | ||
9 | #ROTATESIZE=0 # rotate log if grown beyond X [kByte] (incompatible with busybox) | ||
10 | #ROTATEGENS=3 # keep X generations of rotated logs (incompatible with busybox) | ||
11 | BUFFERSIZE=64 # size of circular buffer [kByte] | ||
12 | FOREGROUND=no # run in foreground (don't use!) | ||