[OE-core] [PATCH] busybox: rename syslog.conf to syslog-startup.conf

Richard Purdie richard.purdie at linuxfoundation.org
Wed Jan 4 12:03:18 UTC 2012


On Mon, 2012-01-02 at 13:50 -0800, Joshua Lock wrote:
> 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 at linux.intel.com>
> ---
>  meta/recipes-core/busybox/busybox.inc              |   10 +++++-----
>  meta/recipes-core/busybox/busybox_1.19.3.bb        |    4 ++--
>  meta/recipes-core/busybox/files/syslog             |    4 ++--
>  .../recipes-core/busybox/files/syslog-startup.conf |   12 ++++++++++++
>  meta/recipes-core/busybox/files/syslog.conf        |    9 ---------
>  5 files changed, 21 insertions(+), 18 deletions(-)
>  create mode 100644 meta/recipes-core/busybox/files/syslog-startup.conf
>  delete mode 100644 meta/recipes-core/busybox/files/syslog.conf

Merged to master, thanks.

Richard





More information about the Openembedded-core mailing list