diff options
author | Joshua Lock <josh@linux.intel.com> | 2012-01-11 10:57:07 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-19 11:34:08 +0000 |
commit | cbc784f4ebf26e5440104dacb45ccced9ef3d594 (patch) | |
tree | 35634f9cda19931d1aa61608e5295a5931e3fee7 /meta | |
parent | 703e1f06fd19612f23c1ae1e8085f75b4ee5c16a (diff) | |
download | poky-cbc784f4ebf26e5440104dacb45ccced9ef3d594.tar.gz |
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
(From OE-Core rev: 0e85cd35a71fe14adc3da9b756b919836b687a12)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/busybox/files/syslog | 3 | ||||
-rw-r--r-- | meta/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 5ff6599ee8..0be412bbeb 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 | |||
37 | if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then | 37 | if [ "$LOG_LOCAL" = "1" -a "$LOG_REMOTE" = "1" ]; then |
38 | SYSLOG_ARGS="$SYSLOG_ARGS -L" | 38 | SYSLOG_ARGS="$SYSLOG_ARGS -L" |
39 | fi | 39 | fi |
40 | if [ -n "$MARKINT" ]; then | ||
41 | SYSLOG_ARGS="$SYSLOG_ARGS -m $MARKINT" | ||
42 | fi | ||
43 | if [ "$REDUCE" = "yes" ]; then | 40 | if [ "$REDUCE" = "yes" ]; then |
44 | SYSLOG_ARGS="$SYSLOG_ARGS -S" | 41 | SYSLOG_ARGS="$SYSLOG_ARGS -S" |
45 | fi | 42 | fi |
diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf index 903a60ce8b..1e4c559a81 100644 --- a/meta/recipes-core/busybox/files/syslog-startup.conf +++ b/meta/recipes-core/busybox/files/syslog-startup.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | # /etc/init.d/syslog[.busybox] to set syslog configuration at start time. | 2 | # /etc/init.d/syslog[.busybox] to set syslog configuration at start time. |
3 | 3 | ||
4 | DESTINATION=buffer # log destinations (buffer file remote) | 4 | DESTINATION=buffer # log destinations (buffer file remote) |
5 | MARKINT=20 # interval between --mark-- entries | ||
6 | LOGFILE=/var/log/messages # where to log (file) | 5 | LOGFILE=/var/log/messages # where to log (file) |
7 | REMOTE=loghost:514 # where to log (syslog remote) | 6 | REMOTE=loghost:514 # where to log (syslog remote) |
8 | REDUCE=no # reduce-size logging | 7 | REDUCE=no # reduce-size logging |