busybox: update to 1.22.1

[openwrt/svn-archive/archive.git] / package / utils / busybox / config / sysklogd / Config.in

diff --git a/package/utils/busybox/config/sysklogd/Config.in b/package/utils/busybox/config/sysklogd/Config.in
index fe08eb2c98da2abbd87dfd2f3b6637ef7cf93bbe..de36a1e89263f8469b1bb4f9a0e60972ff27d428 100644 (file)
--- 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