kernel: update linux 3.2 to 3.2.12

[openwrt.git] / package / busybox / config / sysklogd / Config.in

diff --git a/package/busybox/config/sysklogd/Config.in b/package/busybox/config/sysklogd/Config.in
index ea134b5..20e1aff 100644 (file)
--- a/package/busybox/config/sysklogd/Config.in
+++ b/package/busybox/config/sysklogd/Config.in
@@ -1,3 +1,4 @@
+# DO NOT EDIT. This file is generated from Config.src

 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.


@@ -5,6 +6,8 @@
 
 menu "System Logging Utilities"
 
 
 menu "System Logging Utilities"
 

+
+

 config BUSYBOX_CONFIG_SYSLOGD
        bool "syslogd"
        default y
 config BUSYBOX_CONFIG_SYSLOGD
        bool "syslogd"
        default y


@@ -50,6 +53,13 @@ config BUSYBOX_CONFIG_FEATURE_SYSLOGD_DUP
          Option -D instructs syslogd to drop consecutive messages
          which are totally the same.
 
          Option -D instructs syslogd to drop consecutive messages
          which are totally the same.
 

+config BUSYBOX_CONFIG_FEATURE_SYSLOGD_CFG
+       bool "Support syslog.conf"
+       default n
+       depends on BUSYBOX_CONFIG_SYSLOGD
+       help
+         Supports restricted syslogd config. See docs/syslog.conf.txt
+

 config BUSYBOX_CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE
        int "Read buffer size in bytes"
        default 256
 config BUSYBOX_CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE
        int "Read buffer size in bytes"
        default 256


@@ -114,6 +124,23 @@ config BUSYBOX_CONFIG_KLOGD
          you wish to record the messages produced by the kernel,
          you should enable this option.
 
          you wish to record the messages produced by the kernel,
          you should enable this option.
 

+config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL
+       bool "Use the klogctl() interface"
+       default y
+       depends on BUSYBOX_CONFIG_KLOGD
+       select BUSYBOX_CONFIG_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 BUSYBOX_CONFIG_LOGGER
        bool "logger"
        default y
 config BUSYBOX_CONFIG_LOGGER
        bool "logger"
        default y