Accepting request 556009 from home:kukuk:branches:Base:System

- If we do a fresh installation, call systemctl preset-all in the
  %posttrans section. Some services need to be installed before
  systemd or do not strictly require systemd, so systemd would only
  be installed after them and the systemd units of this package
  never enabled.

- Enable klog.service and rsyslog.service by default, currently
  they enable themself always in post install section.

OBS-URL: https://build.opensuse.org/request/show/556009
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-branding-openSUSE?expand=0&rev=102
This commit is contained in:
Marcus Meissner 2017-12-11 16:11:14 +00:00 committed by Git OBS Bridge
parent ccc79d0fd5
commit d35d212d2e
3 changed files with 25 additions and 0 deletions

View File

@ -21,6 +21,7 @@ enable irqbalance.service
enable iscsi.service
enable iscsid.socket
enable issue-generator.service
enable klog.service
enable logrotate.timer
enable lvm2-lvmetad.socket
enable mcelog.service
@ -29,6 +30,7 @@ enable nscd.service
enable postfix.service
enable purge-kernels.service
enable remote-fs.target
enable rsyslog.service
enable shadow.timer
enable smartd.service
enable snapper-cleanup.timer

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Dec 11 16:17:30 CET 2017 - kukuk@suse.de
- If we do a fresh installation, call systemctl preset-all in the
%posttrans section. Some services need to be installed before
systemd or do not strictly require systemd, so systemd would only
be installed after them and the systemd units of this package
never enabled.
-------------------------------------------------------------------
Mon Dec 11 16:02:43 CET 2017 - kukuk@suse.de
- Enable klog.service and rsyslog.service by default, currently
they enable themself always in post install section.
-------------------------------------------------------------------
Wed Dec 6 13:47:02 CET 2017 - kukuk@suse.de

View File

@ -71,6 +71,8 @@ if [ $1 -gt 1 -a -x %{_prefix}/lib/%{generic_name}/branding-preset-states ] ; th
# Note: the old version of the script is used here.
#
%{_prefix}/lib/%{generic_name}/branding-preset-states save
elif [ $1 -eq 1 ]; then
touch /run/rpm-%{name}-preset-all
fi
%post
@ -82,6 +84,12 @@ if [ $1 -gt 1 ] ; then
%{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes
fi
%posttrans
if [ -f /run/rpm-%{name}-preset-all ]; then
systemctl preset-all
fi
rm -f /run/rpm-%{name}-preset-all
%files
%defattr(-,root,root)
%{_prefix}/lib/%{generic_name}/