aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-11 10:57:07 -0800
committerSaul Wold <sgw@linux.intel.com>2012-01-19 01:16:27 -0800
commit0e85cd35a71fe14adc3da9b756b919836b687a12 (patch)
tree1cbee9d931a653e336441a7e0f3c85117298cc20 /meta/recipes-core/busybox
parentea660263d20066f35a47e60a9d48832ff3959ac3 (diff)
downloadopenembedded-core-contrib-0e85cd35a71fe14adc3da9b756b919836b687a12.tar.gz
openembedded-core-contrib-0e85cd35a71fe14adc3da9b756b919836b687a12.tar.bz2
openembedded-core-contrib-0e85cd35a71fe14adc3da9b756b919836b687a12.zip
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>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/files/syslog3
-rw-r--r--meta/recipes-core/busybox/files/syslog-startup.conf1
2 files changed, 0 insertions, 4 deletions
diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
index 5ff6599ee87..0be412bbebe 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 903a60ce8b4..1e4c559a817 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