busybox: drop MARKINT option from init script and syslog-startup.conf

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 <josh@linux.intel.com>

diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
index 5ff6599ee87441d778b6f53e1fb3a54ef5c1e0a8..0be412bbebed5bcb8c57d75c19db6102e50949b0 100644 (file)
--- 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 903a60ce8b438e08e46b4e70c8d215ff0849dfba..1e4c559a81765a99b94f6347972789e50c3fe93e 100644 (file)
--- 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