From patchwork Thu Jan 19 09:22:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 04/33] busybox: drop MARKINT option from init script and syslog-startup.conf Date: Thu, 19 Jan 2012 09:22:25 -0000 From: Saul Wold X-Patchwork-Id: 19695 Message-Id: <0e85cd35a71fe14adc3da9b756b919836b687a12.1326964778.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Joshua Lock This option has been disabled in busybox since 2007 as it was deemed too buggy. See: http://git.busybox.net/busybox/commit/?id=4998c818919477d90674a3f220e7407c26da17f9 Signed-off-by: Joshua Lock --- meta/recipes-core/busybox/files/syslog | 3 --- .../recipes-core/busybox/files/syslog-startup.conf | 1 - 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog index 5ff6599..0be412b 100644 --- a/meta/recipes-core/busybox/files/syslog +++ b/meta/recipes-core/busybox/files/syslog @@ -37,9 +37,6 @@ if [ -f /etc/syslog-startup.conf ]; then if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then SYSLOG_ARGS="$SYSLOG_ARGS -L" fi - if [ -n "$MARKINT" ]; then - SYSLOG_ARGS="$SYSLOG_ARGS -m $MARKINT" - fi if [ "$REDUCE" = "yes" ]; then SYSLOG_ARGS="$SYSLOG_ARGS -S" fi diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf index 903a60c..1e4c559 100644 --- a/meta/recipes-core/busybox/files/syslog-startup.conf +++ b/meta/recipes-core/busybox/files/syslog-startup.conf @@ -2,7 +2,6 @@ # /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