summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-11 11:06:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-19 11:34:09 +0000
commit3ba7426bbf6be7a708c22d573513a4fd6a3c90d0 (patch)
tree01f0c810b70add3cd1f673a87bef59af11639951
parent35d1c6821d0ad6557203336a4440cfd8e1480c7d (diff)
downloadpoky-3ba7426bbf6be7a708c22d573513a4fd6a3c90d0.tar.gz
busybox: enable dropping of duplicates in syslog, off by default
Busybox syslog includes functionality to drop duplicated syslog entries, enable this feature in the defconfig yet disable it by default. Expose configuration of the feature through the syslog-startup.conf file and the syslog init script. (From OE-Core rev: 0afa9a63a83ee128dac522af70e1f823b7d6a6df) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.3/defconfig2
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.3.bb2
-rw-r--r--meta/recipes-core/busybox/files/syslog3
-rw-r--r--meta/recipes-core/busybox/files/syslog-startup.conf1
4 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
index ebd751d748..b474ad4087 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
@@ -997,7 +997,7 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
997CONFIG_SYSLOGD=y 997CONFIG_SYSLOGD=y
998CONFIG_FEATURE_ROTATE_LOGFILE=y 998CONFIG_FEATURE_ROTATE_LOGFILE=y
999CONFIG_FEATURE_REMOTE_LOG=y 999CONFIG_FEATURE_REMOTE_LOG=y
1000# CONFIG_FEATURE_SYSLOGD_DUP is not set 1000CONFIG_FEATURE_SYSLOGD_DUP=y
1001CONFIG_FEATURE_SYSLOGD_CFG=y 1001CONFIG_FEATURE_SYSLOGD_CFG=y
1002CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 1002CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
1003CONFIG_FEATURE_IPC_SYSLOG=y 1003CONFIG_FEATURE_IPC_SYSLOG=y
diff --git a/meta/recipes-core/busybox/busybox_1.19.3.bb b/meta/recipes-core/busybox/busybox_1.19.3.bb
index f591856a36..a0754071d9 100644
--- a/meta/recipes-core/busybox/busybox_1.19.3.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.3.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r2" 2PR = "r3"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \
diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
index deeea8ba65..2944d3d06c 100644
--- a/meta/recipes-core/busybox/files/syslog
+++ b/meta/recipes-core/busybox/files/syslog
@@ -40,6 +40,9 @@ if [ -f /etc/syslog-startup.conf ]; then
40 if [ "$REDUCE" = "yes" ]; then 40 if [ "$REDUCE" = "yes" ]; then
41 SYSLOG_ARGS="$SYSLOG_ARGS -S" 41 SYSLOG_ARGS="$SYSLOG_ARGS -S"
42 fi 42 fi
43 if [ "$DROPDUPLICATES" = "yes" ]; then
44 SYSLOG_ARGS="$SYSLOG_ARGS -D"
45 fi
43 if [ -n "$LOGLEVEL" ]; then 46 if [ -n "$LOGLEVEL" ]; then
44 SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL" 47 SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL"
45 fi 48 fi
diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf
index 553490bd7d..fda450aa0d 100644
--- a/meta/recipes-core/busybox/files/syslog-startup.conf
+++ b/meta/recipes-core/busybox/files/syslog-startup.conf
@@ -5,6 +5,7 @@ DESTINATION=file # log destinations (buffer file remote)
5LOGFILE=/var/log/messages # where to log (file) 5LOGFILE=/var/log/messages # where to log (file)
6REMOTE=loghost:514 # where to log (syslog remote) 6REMOTE=loghost:514 # where to log (syslog remote)
7REDUCE=no # reduce-size logging 7REDUCE=no # reduce-size logging
8DROPDUPLICATES=no # whether to drop duplicate log entries
8#ROTATESIZE=0 # rotate log if grown beyond X [kByte] 9#ROTATESIZE=0 # rotate log if grown beyond X [kByte]
9#ROTATEGENS=3 # keep X generations of rotated logs 10#ROTATEGENS=3 # keep X generations of rotated logs
10BUFFERSIZE=64 # size of circular buffer [kByte] 11BUFFERSIZE=64 # size of circular buffer [kByte]