Bump to version 1.22.1

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

diff --git a/sysklogd/Config.src b/sysklogd/Config.src
index af00d65..fcf9930 100644 (file)
--- a/sysklogd/Config.src
+++ b/sysklogd/Config.src
@@ -5,6 +5,8 @@
 
 menu "System Logging Utilities"
 
+INSERT
+
 config SYSLOGD
        bool "syslogd"
        default y
@@ -50,6 +52,13 @@ config FEATURE_SYSLOGD_DUP
          Option -D instructs syslogd to drop consecutive messages
          which are totally the same.
 
+config FEATURE_SYSLOGD_CFG
+       bool "Support syslog.conf"
+       default y
+       depends on SYSLOGD
+       help
+         Supports restricted syslogd config. See docs/syslog.conf.txt
+
 config FEATURE_SYSLOGD_READ_BUFFER_SIZE
        int "Read buffer size in bytes"
        default 256
@@ -104,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
@@ -114,6 +136,26 @@ 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
+       depends on KLOGD
+       select PLATFORM_LINUX
+       help
+         The klogd applet supports two interfaces for reading
+         kernel messages. Linux provides the klogctl() interface
+         which allows reading messages from the kernel ring buffer
+         independently from the file system.
+
+         If you answer 'N' here, klogd will use the more portable
+         approach of reading them from /proc or a device node.
+         However, this method requires the file to be available.
+
+         If in doubt, say 'Y'.
+
 config LOGGER
        bool "logger"
        default y
@@ -125,4 +167,3 @@ config LOGGER
            problems that occur within programs and scripts.
 
 endmenu
-