Bump to version 1.22.1

[platform/upstream/busybox.git] / sysklogd / Config.src

diff --git a/sysklogd/Config.src b/sysklogd/Config.src
index b7a494e..fcf9930 100644 (file)
--- a/sysklogd/Config.src
+++ b/sysklogd/Config.src
@@ -113,6 +113,19 @@ config FEATURE_LOGREAD_REDUCED_LOCKING
          from circular buffer, minimizing semaphore
          contention at some minor memory expense.
 
+config FEATURE_KMSG_SYSLOG
+       bool "Linux kernel printk buffer support"
+       default y
+       depends on SYSLOGD
+       select 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 KLOGD
        bool "klogd"
        default y
@@ -123,6 +136,9 @@ 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 KLOGD && FEATURE_KMSG_SYSLOG
+
 config FEATURE_KLOGD_KLOGCTL
        bool "Use the klogctl() interface"
        default y