Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] busybox: rename syslog.conf to syslog-startup.conf
Date: Wed, 04 Jan 2012 12:03:18 +0000	[thread overview]
Message-ID: <1325678598.3555.132.camel@ted> (raw)
In-Reply-To: <1325541032-29837-1-git-send-email-josh@linux.intel.com>

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@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




      parent reply	other threads:[~2012-01-04 12:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-02 21:50 [PATCH] busybox: rename syslog.conf to syslog-startup.conf Joshua Lock
2012-01-02 22:20 ` Saul Wold
2012-01-02 23:11   ` Joshua Lock
2012-01-03 20:06 ` Anders Darander
2012-01-04 12:03 ` Richard Purdie [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1325678598.3555.132.camel@ted \
    --to=richard.purdie@linuxfoundation.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox