rsyslog/rsyslog-unit.patch

---
 rsyslog.service.in |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: rsyslog-7.4.1/rsyslog.service.in
===================================================================
--- rsyslog-7.4.1.orig/rsyslog.service.in	2013-06-17 06:50:28.000000000 +0100
+++ rsyslog-7.4.1/rsyslog.service.in	2013-06-22 21:41:46.000000000 +0100
@@ -1,11 +1,18 @@
 [Unit]
 Description=System Logging Service
 Requires=syslog.socket
+Requires=var-run.mount
+After=var-run.mount
+Conflicts=syslog-ng.service syslogd.service
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/rsyslogd -n
+ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS
 StandardOutput=null
+Environment=RSYSLOGD_PARAMS=
+ExecStartPre=@sbindir@/rsyslog-service-prepare
+EnvironmentFile=-/etc/sysconfig/syslog
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target
Accepting request 180608 from home:AndreasStieger:branches:Base:System update to 7.4.1 [v7.4-stable] OBS-URL: https://build.opensuse.org/request/show/180608 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=152 2013-06-26 12:15:38 +02:00			`---`
			`rsyslog.service.in \| 9 ++++++++-`
			`1 file changed, 8 insertions(+), 1 deletion(-)`

			`Index: rsyslog-7.4.1/rsyslog.service.in`
			`===================================================================`
			`--- rsyslog-7.4.1.orig/rsyslog.service.in 2013-06-17 06:50:28.000000000 +0100`
			`+++ rsyslog-7.4.1/rsyslog.service.in 2013-06-22 21:41:46.000000000 +0100`
			`@@ -1,11 +1,18 @@`
Accepting request 163983 from home:elvigia:branches:Base:System - Fix systemd units to do exactly what is documented as required --> http://www.freedesktop.org/wiki/Software/systemd/syslog In particular, it must not mess with the ordering of syslog.target this is done by removing the custom unit and adapting the upstream one with openSUSE additions (rsyslog-unit.patch) OBS-URL: https://build.opensuse.org/request/show/163983 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=132 2013-04-14 18:56:48 +02:00			`[Unit]`
			`Description=System Logging Service`
Accepting request 180608 from home:AndreasStieger:branches:Base:System update to 7.4.1 [v7.4-stable] OBS-URL: https://build.opensuse.org/request/show/180608 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=152 2013-06-26 12:15:38 +02:00			`Requires=syslog.socket`
Accepting request 163983 from home:elvigia:branches:Base:System - Fix systemd units to do exactly what is documented as required --> http://www.freedesktop.org/wiki/Software/systemd/syslog In particular, it must not mess with the ordering of syslog.target this is done by removing the custom unit and adapting the upstream one with openSUSE additions (rsyslog-unit.patch) OBS-URL: https://build.opensuse.org/request/show/163983 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=132 2013-04-14 18:56:48 +02:00			`+Requires=var-run.mount`
			`+After=var-run.mount`
			`+Conflicts=syslog-ng.service syslogd.service`

			`[Service]`
Accepting request 180608 from home:AndreasStieger:branches:Base:System update to 7.4.1 [v7.4-stable] OBS-URL: https://build.opensuse.org/request/show/180608 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=152 2013-06-26 12:15:38 +02:00			`Type=notify`
- Fixed service file to pass $RSYSLOGD_PARAMS to rsyslogd again. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=133 2013-04-16 10:58:53 +02:00			`-ExecStart=@sbindir@/rsyslogd -n`
Accepting request 180608 from home:AndreasStieger:branches:Base:System update to 7.4.1 [v7.4-stable] OBS-URL: https://build.opensuse.org/request/show/180608 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=152 2013-06-26 12:15:38 +02:00			`+ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS`
			`StandardOutput=null`
Accepting request 163983 from home:elvigia:branches:Base:System - Fix systemd units to do exactly what is documented as required --> http://www.freedesktop.org/wiki/Software/systemd/syslog In particular, it must not mess with the ordering of syslog.target this is done by removing the custom unit and adapting the upstream one with openSUSE additions (rsyslog-unit.patch) OBS-URL: https://build.opensuse.org/request/show/163983 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=132 2013-04-14 18:56:48 +02:00			`+Environment=RSYSLOGD_PARAMS=`
			`+ExecStartPre=@sbindir@/rsyslog-service-prepare`
			`+EnvironmentFile=-/etc/sysconfig/syslog`
			`+ExecReload=/bin/kill -HUP $MAINPID`

			`[Install]`
Accepting request 180608 from home:AndreasStieger:branches:Base:System update to 7.4.1 [v7.4-stable] OBS-URL: https://build.opensuse.org/request/show/180608 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=152 2013-06-26 12:15:38 +02:00			`WantedBy=multi-user.target`