pool/syslogd
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=63
This commit is contained in:
Dr. Werner Fink 2011-09-20 08:42:42 +00:00 committed by Git OBS Bridge
parent 0bf29b22e2
commit 1f00c0019d
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
syslog-service-generator
View File

@ -320,13 +320,5 @@ else
fi fi
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 # end of /lib/systemd/system-generator/syslog-service-generator

2
syslog.service
View File

@ -18,7 +18,7 @@ Requires=var-run.mount syslog.target
After=var-run.mount After=var-run.mount
Before=syslog.target Before=syslog.target
OnFailure=systemd-kmsg-syslogd.service OnFailure=systemd-kmsg-syslogd.service
Names=earlysyslog.service Conflicts=syslog-ng.service rsyslog.service
# #
# Now systemd include the further dependency rules and # Now systemd include the further dependency rules and

9
syslogd.changes
View File

@ -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 Fri Sep 2 08:23:34 UTC 2011 - werner@suse.de

2
syslogd.spec
View File

@ -195,6 +195,7 @@ mv sample-s390.conf sample.conf
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{sysdsysunitdir}/ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{sysdsysunitdir}/
install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{sysdsysunitdir}/ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{sysdsysunitdir}/
install -m 644 %{SOURCE12} $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 %ifarch s390 s390x
sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \ sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \
> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog > $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(noreplace) /etc/logrotate.d/syslog
%config /etc/init.d/syslog %config /etc/init.d/syslog
%config /etc/init.d/earlysyslog %config /etc/init.d/earlysyslog
%config %{sysdsysunitdir}/earlysyslog.service
%config %{sysdsysunitdir}/syslog.service %config %{sysdsysunitdir}/syslog.service
%config %{sysdsysunitdir}/klog.service %config %{sysdsysunitdir}/klog.service
%doc %{_mandir}/man8/syslog.8.gz %doc %{_mandir}/man8/syslog.8.gz