From 1f00c0019dcbee90cba9709ff90403fff8f84587671ec5740048882e40ae7c45 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 20 Sep 2011 08:42:42 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=63
---
 syslog-service-generator | 8 --------
 syslog.service           | 2 +-
 syslogd.changes          | 9 +++++++++
 syslogd.spec             | 2 ++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/syslog-service-generator b/syslog-service-generator
index e2fab02..bf2bab9 100644
--- a/syslog-service-generator
+++ b/syslog-service-generator
@@ -320,13 +320,5 @@ else
     fi
 fi
 
-#
-# Last but not least remove the old (early) service links from SystemV init
-#
-for service in /etc/init.d/*.d/*syslog ; do
-    test -h $service || continue
-    /bin/rm -f $service
-done
-
 #
 # end of /lib/systemd/system-generator/syslog-service-generator
diff --git a/syslog.service b/syslog.service
index 3533562..21c4ab9 100644
--- a/syslog.service
+++ b/syslog.service
@@ -18,7 +18,7 @@ Requires=var-run.mount syslog.target
 After=var-run.mount
 Before=syslog.target
 OnFailure=systemd-kmsg-syslogd.service
-Names=earlysyslog.service
+Conflicts=syslog-ng.service rsyslog.service
 
 #
 # Now systemd include the further dependency rules and
diff --git a/syslogd.changes b/syslogd.changes
index 7f4ffe2..85a1c84 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep 20 08:38:55 UTC 2011 - werner@suse.de
+
+- Add syslink to /dev/null for earlysyslog service unit to avoid
+  to start it twice with systemd
+- Do not disable SysV service links with systemd
+- For syslog service unit add conflicts witjh syslog-ng and rsyslog
+  service units
+
 -------------------------------------------------------------------
 Fri Sep  2 08:23:34 UTC 2011 - werner@suse.de
 
diff --git a/syslogd.spec b/syslogd.spec
index 9c0bd62..a76ef31 100644
--- a/syslogd.spec
+++ b/syslogd.spec
@@ -195,6 +195,7 @@ mv sample-s390.conf sample.conf
     install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{sysdsysunitdir}/
     install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{sysdsysunitdir}/
     install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{sysdsysunitdir}/
+    ln -sf /dev/null $RPM_BUILD_ROOT%{sysdsysunitdir}/earlysyslog.service
 %ifarch s390 s390x
     sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \
 	> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
@@ -304,6 +305,7 @@ mkdir -p -m 0755 var/run/syslog-ng
 %config(noreplace) /etc/logrotate.d/syslog
 %config /etc/init.d/syslog
 %config /etc/init.d/earlysyslog
+%config %{sysdsysunitdir}/earlysyslog.service
 %config %{sysdsysunitdir}/syslog.service
 %config %{sysdsysunitdir}/klog.service
 %doc %{_mandir}/man8/syslog.8.gz