diff --git a/sysconfig.syslog b/sysconfig.syslog index de7c9d9..3881390 100644 --- a/sysconfig.syslog +++ b/sysconfig.syslog @@ -1,16 +1,6 @@ ## Path: System/Logging ## Description: System logging -## Type: string -## Default: "" -## Config: "" -## ServiceRestart: syslog -# -# if not empty: parameters for syslogd -# for example SYSLOGD_PARAMS="-r -s my.dom.ain" -# -SYSLOGD_PARAMS="" - ## Type: list(syslogd,syslog-ng,rsyslogd,"") ## Default: "" ## Config: "" diff --git a/syslog.service b/syslog.service index b5d2987..3533562 100644 --- a/syslog.service +++ b/syslog.service @@ -18,6 +18,7 @@ Requires=var-run.mount syslog.target After=var-run.mount Before=syslog.target OnFailure=systemd-kmsg-syslogd.service +Names=earlysyslog.service # # Now systemd include the further dependency rules and diff --git a/syslogd.spec b/syslogd.spec index e336655..26a445e 100644 --- a/syslogd.spec +++ b/syslogd.spec @@ -35,14 +35,16 @@ Summary: The Syslog daemon Source: sysklogd-1.4.1.tar.bz2 Source1: logrotate.syslog Source2: sysconfig.syslog -Source3: rc.syslog -Source4: rc.earlysyslog -Source5: syslog.xml -Source6: syslog.8 -Source7: syslog-service-generator -Source8: klogd.service -Source9: syslog.service -Source10: klog.service +Source3: sysconfig.syslogd +Source4: sysconfig.klogd +Source5: rc.syslog +Source6: rc.earlysyslog +Source7: syslog.xml +Source8: syslog.8 +Source9: syslog-service-generator +Source10: klogd.service +Source11: syslog.service +Source12: klog.service Patch0: sysklogd-1.4.1.dif Patch1: sysklogd-1.4.1-dgram.patch Patch2: sysklogd-1.4.1-sparc.patch @@ -179,15 +181,17 @@ mv sample-s390.conf sample.conf ln -sf ../etc/init.d/syslog $RPM_BUILD_ROOT/sbin/rcsyslog install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/syslog install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates - install -m 754 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/syslog - install -m 754 %{SOURCE4} $RPM_BUILD_ROOT/etc/init.d/earlysyslog + install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates + install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/var/adm/fillup-templates + install -m 754 %{SOURCE5} $RPM_BUILD_ROOT/etc/init.d/syslog + install -m 754 %{SOURCE6} $RPM_BUILD_ROOT/etc/init.d/earlysyslog 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%{sysdsysunitdir}-generators/ - install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{sysdsysunitdir}/ - install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{sysdsysunitdir}/ + install -m 600 %{SOURCE7} $RPM_BUILD_ROOT/%{omc_svcdir}/ + install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_mandir}/man8/syslog.8 + install -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{sysdsysunitdir}-generators/ install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{sysdsysunitdir}/ + install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{sysdsysunitdir}/ + install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{sysdsysunitdir}/ %ifarch s390 s390x sed 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' %{SOURCE2} \ > $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog @@ -293,10 +297,12 @@ mkdir -p -m 0755 var/run/syslog-ng %files -n syslog-service %defattr(-,root,root) +/var/adm/fillup-templates/sysconfig.syslog %config(noreplace) /etc/logrotate.d/syslog %config /etc/init.d/syslog %config /etc/init.d/earlysyslog %config %{sysdsysunitdir}/syslog.service +%config %{sysdsysunitdir}/klog.service %doc %{_mandir}/man8/syslog.8.gz /sbin/rcsyslog %attr(0744,root,root) %{sysdsysunitdir}-generators/syslog-service-generator