3 files changed, 31 insertions, 40 deletions
diff --git a/source/a/sysklogd/config/rc.syslog.new b/source/a/sysklogd/config/rc.syslog.new
index f2b51d5eb..a802ec38a 100644
--- a/source/a/sysklogd/config/rc.syslog.new
+++ b/source/a/sysklogd/config/rc.syslog.new
@@ -1,42 +1,22 @@
 #!/bin/sh
-# Start/stop/restart the system logging daemons.
+# Start/stop/restart the system logging daemon.
 #
 # Written for Slackware Linux by Patrick J. Volkerding <volkerdi@slackware.com>.
 
-# Uncomment the following line to use the -c option to syslogd.  This will
-# disable suppressing repeated messages, which may be useful with tools that
-# parse the logs, such as fail2ban:
-#SYSLOGD_OPTIONS="-c "
-
-# Options for klogd:
-# '-c 3' = display level 'error' or higher messages on console
-# '-x' = turn off broken EIP translation
-KLOGD_OPTIONS="-c 3 -x"
+# Source default settings:
+if [ -r /etc/default/syslogd ]; then
+  . /etc/default/syslogd
+fi
 
 syslogd_start() {
-  if [ -x /usr/sbin/syslogd -a -x /usr/sbin/klogd ]; then
-    echo -n "Starting sysklogd daemons:  "
-    echo -n "/usr/sbin/syslogd ${SYSLOGD_OPTIONS};"
-    /usr/sbin/syslogd $SYSLOGD_OPTIONS
-    # prevent syslogd/klogd race condition on SMP kernels
-    if ps acx | grep -q udevd ; then
-      while [ ! -e /dev/log ] ; do
-        sleep 0
-      done
-    else
-      sleep 1
-    fi
-    # Run klogd, unless we are in a container:
-    if [ -z $container ]; then
-      echo " /usr/sbin/klogd $KLOGD_OPTIONS"
-      /usr/sbin/klogd $KLOGD_OPTIONS
-    fi
+  if [ -x /usr/sbin/syslogd ]; then
+    echo -n "Starting syslogd daemon:  /usr/sbin/syslogd ${SYSLOGD_OPTS}"
+    /usr/sbin/syslogd $SYSLOGD_OPTS
   fi
 }
 
 syslogd_stop() {
   killall syslogd 2> /dev/null
-  killall klogd 2> /dev/null
 }
 
 syslogd_restart() {
diff --git a/source/a/sysklogd/config/syslog.conf.new b/source/a/sysklogd/config/syslog.conf.new
index 15bc5ee41..4cf787aef 100644
--- a/source/a/sysklogd/config/syslog.conf.new
+++ b/source/a/sysklogd/config/syslog.conf.new
@@ -1,26 +1,31 @@
 # /etc/syslog.conf
 # For info about the format of this file, see "man syslog.conf"
-# and /usr/doc/sysklogd/README.linux.  Note the '-' prefixing some
-# of these entries;  this omits syncing the file after every logging.
+# and /usr/doc/sysklogd/README.linux. Note the '-' prefixing some
+# of these entries; this omits syncing the file after every logging.
 # In the event of a crash, some log information might be lost, so
 # if this is a concern to you then you might want to remove the '-'.
-# Be advised this will cause a performation loss if you're using
+# Be advised this will cause a performance loss if you're using
 # programs that do heavy logging.
 
-# Uncomment this to see kernel messages on the console.
-#kern.*							/dev/console
+# Uncomment to see kernel messages 'err' or higher on the console.
+# Note that this is disabled by default because the kernel has defined
+# the "No irq handler for vector" message as 'emerg' (the highest, your
+# system should be considered unusable) level and will spam the console
+# during boot. But perhaps you can live with that in order to see the
+# other kernel messages...
+#kern.err						/dev/console
 
 # Log anything 'info' or higher, but lower than 'warn'.
-# Exclude authpriv, cron, mail, and news.  These are logged elsewhere.
+# Exclude authpriv, cron, mail, and news. These are logged elsewhere.
 *.info;*.!warn;\
 	authpriv.none;cron.none;mail.none;news.none	-/var/log/messages
 
 # Log anything 'warn' or higher.
-# Exclude authpriv, cron, mail, and news.  These are logged elsewhere.
+# Exclude authpriv, cron, mail, and news. These are logged elsewhere.
 *.warn;\
 	authpriv.none;cron.none;mail.none;news.none	-/var/log/syslog
 
-# Debugging information is logged here.
+# Debugging information is logged here:
 *.=debug						-/var/log/debug
 
 # Private authentication message logging:
@@ -35,12 +40,14 @@ mail.*							-/var/log/maillog
 # Emergency level messages go to all users:
 *.emerg							*
 
-# This log is for news and uucp errors:
-uucp,news.crit						-/var/log/spooler
+# Uncomment to log news and uucp errors:
+#uucp,news.crit						-/var/log/spooler
 
-# Uncomment these if you'd like INN to keep logs on everything.
-# You won't need this if you don't run INN (the InterNetNews daemon).
+# Uncomment these if you run a news server and would like to log related
+# messages:
 #news.=crit					-/var/log/news/news.crit
 #news.=err					-/var/log/news/news.err
 #news.notice					-/var/log/news/news.notice
 
+# Include all config files in /etc/syslog.d/:
+include /etc/syslog.d/*.conf
diff --git a/source/a/sysklogd/config/syslogd.new b/source/a/sysklogd/config/syslogd.new
new file mode 100644
index 000000000..b621cd8f3
--- /dev/null
+++ b/source/a/sysklogd/config/syslogd.new
@@ -0,0 +1,4 @@
+# Options for the syslog daemon.
+# Default is "-s" to run in secure mode - not accepting network connections.
+# For other options, see syslog(8).
+SYSLOGD_OPTS="-s"