Accepting request 556421 from Base:System

- Don't disable services with preset-all in %posttrans, the network
  is special and would be disabled. (forwarded request 556408 from kukuk)

OBS-URL: https://build.opensuse.org/request/show/556421
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd-presets-branding-openSUSE?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2017-12-13 10:58:07 +00:00 committed by Git OBS Bridge
commit 198ad51b7d
3 changed files with 45 additions and 0 deletions

View File

@ -3,6 +3,11 @@ enable YaST2-Second-Stage.service
enable apparmor.service
enable auditd.service
enable avahi-daemon.service
enable btrfs-balance.timer
enable btrfs-defrag.timer
enable btrfs-scrub.timer
enable btrfs-trim.timer
enable btrfsmaintenance-refresh.service
enable ca-certificates.path
enable ca-certificates.service
enable cron.service
@ -16,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
@ -24,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,30 @@
-------------------------------------------------------------------
Tue Dec 12 10:05:57 CET 2017 - kukuk@suse.de
- Don't disable services with preset-all in %posttrans, the network
is special and would be disabled.
-------------------------------------------------------------------
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
- Enable btrfs-*.timer by default, switch from cron to systemd.timer
- Enable btrfsmaintenance-refresh.service
-------------------------------------------------------------------
Thu Nov 9 02:08:17 UTC 2017 - sckang@suse.com

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,15 @@ if [ $1 -gt 1 ] ; then
%{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes
fi
%posttrans
if [ -f /run/rpm-%{name}-preset-all ]; then
# Enable all services, which were installed before systemd
# Don't disable services, since this would disable the
# complete network stack.
systemctl preset-all --preset-mode=enable-only
fi
rm -f /run/rpm-%{name}-preset-all
%files
%defattr(-,root,root)
%{_prefix}/lib/%{generic_name}/