From 6c0eae96c7a9041995413fab1e252c9359f1c385ac63211e540d28b93d9030a6 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 17 Aug 2011 15:55:27 +0000
Subject: [PATCH] .

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

diff --git a/rc.syslog b/rc.syslog
index c16b6d5..8bad1d5 100644
--- a/rc.syslog
+++ b/rc.syslog
@@ -64,9 +64,7 @@ case "$SYSLOG_DAEMON" in
 	params="$SYSLOG_NG_PARAMS"
 	ngsocks="/var/run/syslog-ng/additional-log-sockets.conf"
 	ngsocksdir="/var/run/syslog-ng"
-	if [ ! -d $ngsocksdir ]; then
-		mkdir -p $ngsocksdir
-	fi
+	mkdir -p -m 0755 $ngsocksdir
 	test -r "$config" && \
 	while read line; do
 	    case $line in file*/proc/kmsg*)
@@ -78,6 +76,7 @@ case "$SYSLOG_DAEMON" in
 	syslog=syslogd
 	config=/etc/syslog.conf
 	params="$SYSLOGD_PARAMS"
+	mkdir -p -m 0755 /var/run
 	;;
 esac
 
diff --git a/syslog-service-generator b/syslog-service-generator
index ffd5c90..0e4f222 100644
--- a/syslog-service-generator
+++ b/syslog-service-generator
@@ -299,7 +299,7 @@ if test "$start_klogd" != no ; then
 fi
 
 #
-# Last but not least remove the old service links from SystemV init
+# 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
diff --git a/syslogd.changes b/syslogd.changes
index 73b8803..2b52619 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 17 15:45:58 UTC 2011 - werner@suse.de
+
+- Add generator script for better support with systemd 
+
 -------------------------------------------------------------------
 Tue Jun 28 08:51:31 UTC 2011 - aj@suse.de
 
diff --git a/syslogd.spec b/syslogd.spec
index 0da730c..2f23f96 100644
--- a/syslogd.spec
+++ b/syslogd.spec
@@ -36,6 +36,7 @@ Source3:        rc.syslog
 Source4:        rc.earlysyslog
 Source5:        syslog.xml
 Source6:        syslog.8
+Source7:        syslog-service-generator
 Patch0:         sysklogd-1.4.1.dif
 Patch1:         sysklogd-1.4.1-dgram.patch
 Patch2:         sysklogd-1.4.1-sparc.patch
@@ -147,6 +148,7 @@ mv sample-s390.conf sample.conf
     mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
     mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
     mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+    mkdir -p $RPM_BUILD_ROOT/lib/systemd/system-generator
     mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/rsyslog
     make install MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT
     ln -sf ../etc/init.d/syslog $RPM_BUILD_ROOT/sbin/rcsyslog
@@ -157,6 +159,7 @@ mv sample-s390.conf sample.conf
     install -d $RPM_BUILD_ROOT/%{omc_svcdir}/
     install -m 600 %{SOURCE5} $RPM_BUILD_ROOT/%{omc_svcdir}/
     install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mandir}/man8/syslog.8
+    install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/lib/systemd/system-generator/
 %ifarch s390 s390x
     sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \
 	> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
@@ -242,9 +245,10 @@ fi
 %doc %{_mandir}/man8/klogd.8.gz
 %doc %{_mandir}/man8/sysklogd.8.gz
 %doc %{_mandir}/man8/syslog.8.gz
-/sbin/rcsyslog
 /sbin/klogd
+/sbin/rcsyslog
 %attr(0755,root,root) %dir %ghost /var/run/rsyslog/
+%attr(0755,root,root) %dir %ghost /var/run/syslog-ng/
 %{omc_svcdir}/syslog.xml
 
 %changelog