aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox/config/sysklogd
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-05-25 17:42:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-05-25 17:42:09 +0000
commitf4f553efa787e1f8f25bb2176f5e6c4c3aa659a9 (patch)
tree310f556f4a68661a07ada2d87790ff02796c941a /package/utils/busybox/config/sysklogd
parenta54791f2baa2e193b5197b754f0b6b29d86d656e (diff)
downloadupstream-f4f553efa787e1f8f25bb2176f5e6c4c3aa659a9.tar.gz
upstream-f4f553efa787e1f8f25bb2176f5e6c4c3aa659a9.tar.bz2
upstream-f4f553efa787e1f8f25bb2176f5e6c4c3aa659a9.zip
busybox: update to 1.22.1
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 40852
Diffstat (limited to 'package/utils/busybox/config/sysklogd')
-rw-r--r--package/utils/busybox/config/sysklogd/Config.in17
1 files changed, 16 insertions, 1 deletions
diff --git a/package/utils/busybox/config/sysklogd/Config.in b/package/utils/busybox/config/sysklogd/Config.in
index fe08eb2c98..de36a1e892 100644
--- a/package/utils/busybox/config/sysklogd/Config.in
+++ b/package/utils/busybox/config/sysklogd/Config.in
@@ -7,7 +7,6 @@
menu "System Logging Utilities"
-
config BUSYBOX_CONFIG_SYSLOGD
bool "syslogd"
default BUSYBOX_DEFAULT_SYSLOGD
@@ -114,6 +113,19 @@ config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
from circular buffer, minimizing semaphore
contention at some minor memory expense.
+config BUSYBOX_CONFIG_FEATURE_KMSG_SYSLOG
+ bool "Linux kernel printk buffer support"
+ default BUSYBOX_DEFAULT_FEATURE_KMSG_SYSLOG
+ depends on BUSYBOX_CONFIG_SYSLOGD
+ select BUSYBOX_CONFIG_PLATFORM_LINUX
+ help
+ When you enable this feature, the syslogd utility will
+ write system log message to the Linux kernel's printk buffer.
+ This can be used as a smaller alternative to the syslogd IPC
+ support, as klogd and logread aren't needed.
+
+ NOTICE: Syslog facilities in log entries needs kernel 3.5+.
+
config BUSYBOX_CONFIG_KLOGD
bool "klogd"
default BUSYBOX_DEFAULT_KLOGD
@@ -124,6 +136,9 @@ config BUSYBOX_CONFIG_KLOGD
you wish to record the messages produced by the kernel,
you should enable this option.
+comment "klogd should not be used together with syslog to kernel printk buffer"
+ depends on BUSYBOX_CONFIG_KLOGD && BUSYBOX_CONFIG_FEATURE_KMSG_SYSLOG
+
config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL
bool "Use the klogctl() interface"
default BUSYBOX_DEFAULT_FEATURE_KLOGD_KLOGCTL