From 82233833027e4decbf8041da3a6a005894c7558adf53addb7f97bd82b971bca1 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 6 May 2015 08:13:46 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=127
---
 klog.service    |  8 +++++---
 klogd.service   | 11 +++++------
 syslogd.changes |  5 +++++
 syslogd.service | 10 +++-------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/klog.service b/klog.service
index a530996..cad8451 100644
--- a/klog.service
+++ b/klog.service
@@ -17,15 +17,17 @@
 
 [Unit]
 Description=Early Kernel Boot Messages
-Requires=local-fs.target default.target
-Wants=syslog.service
+DefaultDependencies=no
+Requires=local-fs.target
 After=local-fs.target
-Before=syslog.service default.target
+Before=shutdown.target
 RefuseManualStart=true
 ConditionPathIsDirectory=/var/log
 
 [Service]
 Type=oneshot
+StandardError=tty
+StandardOutput=tty
 RemainAfterExit=yes
 Environment=KLOGCONSOLE_PARAMS=
 EnvironmentFile=-/etc/sysconfig/boot
diff --git a/klogd.service b/klogd.service
index 94a6036..d722a30 100644
--- a/klogd.service
+++ b/klogd.service
@@ -20,20 +20,19 @@
 
 [Unit]
 Description=System Kernel Logging Service
-Requisite=syslog.service
-BindsTo=syslog.service
-After=syslog.service
+Requisite=syslogd.service
+BindsTo=syslogd.service
+After=syslogd.service
 RefuseManualStart=true
 
 [Service]
-Type=forking
+Type=simple
 StandardOutput=syslog
 StandardError=syslog
-PIDFile=/var/run/klogd.pid
 Environment=KERNEL_LOGLEVEL=1
 Environment=KLOGD_PARAMS=
 EnvironmentFile=-/etc/sysconfig/syslog
-ExecStart=/sbin/klogd -c $KERNEL_LOGLEVEL $KLOGD_PARAMS -x
+ExecStart=/sbin/klogd -n -c $KERNEL_LOGLEVEL $KLOGD_PARAMS -x
 
 [Install]
 WantedBy=multi-user.target
diff --git a/syslogd.changes b/syslogd.changes
index 4994c8f..b03ca4a 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  6 08:04:35 UTC 2015 - werner@suse.de
+
+- Modernize systemd service units 
+
 -------------------------------------------------------------------
 Wed Mar 11 09:08:48 UTC 2015 - werner@suse.de
 
diff --git a/syslogd.service b/syslogd.service
index 1518738..350b3c1 100644
--- a/syslogd.service
+++ b/syslogd.service
@@ -18,23 +18,19 @@
 Description=System Logging Service
 Conflicts=syslog-ng.service rsyslog.service
 Requires=var-run.mount
-Requires=syslog.target
+Requires=syslog.socket
 Requires=network.target
 Requires=klogd.service
-Before=syslog.target
 Before=klogd.service
-After=var-run.mount
-After=network.target
 
 [Service]
-Type=forking
-PIDFile=/var/run/syslogd.pid
+Type=notify
 Sockets=syslog.socket
 StandardOutput=null
 Environment=ADDITIONAL_SOCKET=
 ExecStartPre=/usr/sbin/syslogd-service-prepare
 EnvironmentFile=-/var/run/syslogd/additional-log-sockets.env
-ExecStart=/usr/sbin/syslogd $ADDITIONAL_SOCKET
+ExecStart=/usr/sbin/syslogd -n $ADDITIONAL_SOCKET
 ExecReload=/bin/systemctl kill --signal=TSTP klogd.service
 ExecReload=/sbin/killproc -p /var/run/syslogd.pid -HUP /usr/sbin/syslogd
 ExecReload=/bin/systemctl kill --signal=CONT klogd.service