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 c7bac93..20e1aff 100644 (file)
--- a/package/busybox/config/sysklogd/Config.in
+++ b/package/busybox/config/sysklogd/Config.in
@@ -53,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


@@ -120,7 +127,8 @@ config BUSYBOX_CONFIG_KLOGD
 config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL
        bool "Use the klogctl() interface"
        default y
 config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL
        bool "Use the klogctl() interface"
        default y

-       depends on BUSYBOX_CONFIG_KLOGD && BUSYBOX_CONFIG_PLATFORM_LINUX
+       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
        help
          The klogd applet supports two interfaces for reading
          kernel messages. Linux provides the klogctl() interface