Accepting request 171031 from Base:System
- Fixed service file to pass $RSYSLOGD_PARAMS to rsyslogd again. - 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/171031 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=67
This commit is contained in:
commit
be2976c47c
21
rsyslog-unit.patch
Normal file
21
rsyslog-unit.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
--- rsyslog-7.2.5/rsyslog.service.in
|
||||||
|
+++ rsyslog-7.2.5/rsyslog.service.in 2013/04/16 08:48:30
|
||||||
|
@@ -1,9 +1,16 @@
|
||||||
|
[Unit]
|
||||||
|
Description=System Logging Service
|
||||||
|
+Requires=var-run.mount
|
||||||
|
+Requires=syslog.socket
|
||||||
|
+After=var-run.mount
|
||||||
|
+Conflicts=syslog-ng.service syslogd.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
-ExecStart=@sbindir@/rsyslogd -n
|
||||||
|
-Sockets=syslog.socket
|
||||||
|
+Environment=RSYSLOGD_PARAMS=
|
||||||
|
+ExecStartPre=@sbindir@/rsyslog-service-prepare
|
||||||
|
+EnvironmentFile=-/etc/sysconfig/syslog
|
||||||
|
+ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS
|
||||||
|
+ExecReload=/bin/kill -HUP $MAINPID
|
||||||
|
StandardOutput=null
|
||||||
|
|
||||||
|
[Install]
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 16 08:49:49 UTC 2013 - mt@suse.de
|
||||||
|
|
||||||
|
- Fixed service file to pass $RSYSLOGD_PARAMS to rsyslogd again.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Apr 14 06:35:09 UTC 2013 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- 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)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Mar 29 11:53:49 UTC 2013 - vcizek@suse.com
|
Fri Mar 29 11:53:49 UTC 2013 - vcizek@suse.com
|
||||||
|
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=System Logging Service
|
|
||||||
Requires=var-run.mount syslog.target
|
|
||||||
After=var-run.mount
|
|
||||||
Before=syslog.target
|
|
||||||
Conflicts=syslog-ng.service syslogd.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Environment=RSYSLOGD_PARAMS=
|
|
||||||
ExecStartPre=@sbindir@/rsyslog-service-prepare
|
|
||||||
EnvironmentFile=-/etc/sysconfig/syslog
|
|
||||||
ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS
|
|
||||||
ExecReload=/bin/kill -HUP $MAINPID
|
|
||||||
Sockets=syslog.socket
|
|
||||||
StandardOutput=null
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
Alias=syslog.service
|
|
@ -153,7 +153,8 @@ Source1: rsyslog.sysconfig
|
|||||||
Source2: rsyslog.conf.in
|
Source2: rsyslog.conf.in
|
||||||
Source4: rsyslog.d.remote.conf.in
|
Source4: rsyslog.d.remote.conf.in
|
||||||
Source5: rsyslog-service-prepare.in
|
Source5: rsyslog-service-prepare.in
|
||||||
Source6: rsyslog.service.in.in
|
# PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
|
||||||
|
Patch0: rsyslog-unit.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
|
Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
|
||||||
@ -407,9 +408,10 @@ This module provides support for ZeroMQ.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{upstream_version}
|
%setup -q -n %{name}-%{upstream_version}
|
||||||
|
%patch0 -p1
|
||||||
#
|
#
|
||||||
%if %{with systemd}
|
%if %{with systemd}
|
||||||
for file in rsyslog-service-prepare rsyslog.service.in ; do
|
for file in rsyslog-service-prepare; do
|
||||||
sed \
|
sed \
|
||||||
-e 's;RUN_DIR;%{rsyslog_rundir};g' \
|
-e 's;RUN_DIR;%{rsyslog_rundir};g' \
|
||||||
-e 's;ADDITIONAL_SOCKETS;%{rsyslog_sockets_cfg};g' \
|
-e 's;ADDITIONAL_SOCKETS;%{rsyslog_sockets_cfg};g' \
|
||||||
|
Loading…
Reference in New Issue
Block a user