package/sysklogd: replace local syslog.conf sample with upstream

This patch drops the local syslog.conf in favor of the one shipped with
sysklogd.  The upstream syslog.conf sample differs from the Buildroot
one primarily in shifting to /var/log/syslog as the default for log
messages.  It also comes with a dedicated /var/log/kern.log and some
commented-out filtering examples.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index c6c59da69fcc66d648887d056b1da880045fcee8..ff181372b68c56e526d10474ea40d10f50f25d22 100644 (file)
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -25,7 +25,7 @@ SYSKLOGD_CONF_OPTS += --without-logger
 endif
 
 define SYSKLOGD_INSTALL_SAMPLE_CONFIG
-       $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \
+       $(INSTALL) -D -m 0644 $(@D)/syslog.conf \
                $(TARGET_DIR)/etc/syslog.conf
 endef
 

diff --git a/package/sysklogd/syslog.conf b/package/sysklogd/syslog.conf
deleted file mode 100644 (file)
index 411bd64..0000000
--- a/package/sysklogd/syslog.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/syslog.conf - Configuration file for syslogd
-
-auth,authpriv.*                /var/log/auth.log
-*.*;auth,authpriv.none /var/log/messages
-user.*                 /var/log/user.log
-
-*.emerg                        *
-
-include /etc/syslog.d/*.conf