Dr. Werner Fink 2015-05-08 13:44:11 +00:00 committed by Git OBS Bridge
parent 8223383302
commit 240874b621
3 changed files with 16 additions and 0 deletions

7
sysconfig.boot Normal file
View File

@ -0,0 +1,7 @@
## Type: string
## Default: ""
#
# Set additional parameters for klogconsole, e.g. "-l 7"
#
KLOGCONSOLE_PARAMS=""

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 8 13:43:30 UTC 2015 - werner@suse.de
- Reintroduce /etc/sysconfig/boot for having KLOGCONSOLE_PARAMS back
-------------------------------------------------------------------
Wed May 6 08:04:35 UTC 2015 - werner@suse.de

View File

@ -55,6 +55,7 @@ Source8: syslogd.service
Source9: syslogd-service-prepare
Source10: rc.syslog
Source11: syslogd-rpmlintrc
Source12: sysconfig.boot
Patch0: sysklogd-1.4.1.dif
Patch1: sysklogd-1.4.1-dgram.patch
Patch2: sysklogd-1.4.1-sparc.patch
@ -204,6 +205,7 @@ mv sample-s390.conf sample.conf
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{sysdsysunitdir}/
install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/%{_sbindir}/
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/sbin/rcsyslog
install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/var/adm/fillup-templates
for sbin in klogd syslogd ; do
ln -sf %{_sbindir}/${sbin} $RPM_BUILD_ROOT/sbin/${sbin}
done
@ -270,6 +272,7 @@ chown news:news var/log/news/news.notice
%post -n syslog-service
%{remove_and_set -n syslog SYSLOG_DAEMON}
%{remove_and_set -n syslog SYSLOG_REQUIRES_NETWORK}
%{fillup_only -n boot}
# when exists, remove the broken link pointing to the
# common syslog.service file, we've provided before...
rm -f /etc/systemd/system/multi-user.target.wants/syslog.service
@ -326,6 +329,7 @@ rm -f /etc/systemd/system/multi-user.target.wants/syslog.service
%files -n syslog-service
%defattr(-,root,root)
/var/adm/fillup-templates/sysconfig.boot
%config(noreplace) /etc/logrotate.d/syslog
%config %{sysdsysunitdir}/klog.service
%doc %{_mandir}/man8/syslog.8.gz