update busybox to latest upstream

1 files changed, 16 insertions, 0 deletions

diff --git a/package/busybox/config/sysklogd/Config.in b/package/busybox/config/sysklogd/Config.in
index 8d999c8e9..6df10efde 100644
--- a/package/busybox/config/sysklogd/Config.in
+++ b/package/busybox/config/sysklogd/Config.in
@@ -92,6 +92,19 @@ config BUSYBOX_FEATURE_IPC_SYSLOG_BUFFER_SIZE
 	  This option sets the size of the circular buffer
 	  used to record system log messages.
 
+config BUSYBOX_FEATURE_KMSG_SYSLOG
+       bool "Linux kernel printk buffer support"
+       default n
+       depends on BUSYBOX_SYSLOGD
+       select BUSYBOX_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_LOGREAD
 	bool "logread"
 	default y
@@ -123,6 +136,9 @@ config BUSYBOX_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_KLOGD && BUSYBOX_FEATURE_KMSG_SYSLOG
+
 config BUSYBOX_FEATURE_KLOGD_KLOGCTL
 	bool "Use the klogctl() interface"
 	default y