From 93abc85df8a72067aecc72c4773d00b040d6a1e2 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 26 Jun 2020 19:18:25 +0000
Subject: Fri Jun 26 19:18:25 UTC 2020

a/sysklogd-2.1.2-x86_64-1.txz:  Upgraded.
  Make sure to move the .new init script and config into place for this.
ap/undervolt-20200612_07d0c70-x86_64-1.txz:  Added.
l/popt-1.18-x86_64-1.txz:  Upgraded.
x/libglvnd-1.3.2-x86_64-1.txz:  Upgraded.
x/libva-2.8.0-x86_64-1.txz:  Upgraded.
x/libva-utils-2.8.0-x86_64-1.txz:  Upgraded.
---
 source/a/sysklogd/config/rc.syslog.new | 36 ++++++++--------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

(limited to 'source/a/sysklogd/config/rc.syslog.new')

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() {
-- 
cgit v1.2.3-79-gdb01