We tried this back in 2016 and it didn't go so well, because at that time, preset-all was badly broken. See https://bugzilla.redhat.com/show_bug.cgi?id=1363858 for the history there. It seems that the bugs in preset-all were fixed quite soon after that, but for whatever reason, the change to %post was not re-applied (probably it just got forgotten). We've now run into a bug in Rawhide where dbus-daemon is getting installed before systemd despite having a dependency that should make that not happen: https://bugzilla.redhat.com/show_bug.cgi?id=1647172 this is apparently because there are very complex dependency loops during initial install that rpm cannot find a single clearly correct 'answer' for, so it does not always choose to honor this dependency. We can take a look at breaking up those loops, but we also figured it can't hurt to resurrect this change to help with such cases: this way if some service with a preset *does* happen to get installed before systemd, and so its attempt to apply the preset in its own %post fails, that will be fixed up here.
This commit is contained in:
parent
71e781a096
commit
8510cadb34
24
systemd.spec
24
systemd.spec
@ -15,7 +15,7 @@
|
|||||||
Name: systemd
|
Name: systemd
|
||||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||||
Version: 239
|
Version: 239
|
||||||
Release: 8%{?commit:.git%{shortcommit}}%{?dist}
|
Release: 9%{?commit:.git%{shortcommit}}%{?dist}
|
||||||
# For a breakdown of the licensing, see README
|
# For a breakdown of the licensing, see README
|
||||||
License: LGPLv2+ and MIT and GPLv2+
|
License: LGPLv2+ and MIT and GPLv2+
|
||||||
Summary: System and Service Manager
|
Summary: System and Service Manager
|
||||||
@ -510,18 +510,13 @@ if [ -e /etc/fstab ]; then
|
|||||||
sed -i.rpm.bak -r '/^devpts\s+\/dev\/pts\s+devpts\s+defaults\s+/d; /^tmpfs\s+\/dev\/shm\s+tmpfs\s+defaults\s+/d; /^sysfs\s+\/sys\s+sysfs\s+defaults\s+/d; /^proc\s+\/proc\s+proc\s+defaults\s+/d' /etc/fstab || :
|
sed -i.rpm.bak -r '/^devpts\s+\/dev\/pts\s+devpts\s+defaults\s+/d; /^tmpfs\s+\/dev\/shm\s+tmpfs\s+defaults\s+/d; /^sysfs\s+\/sys\s+sysfs\s+defaults\s+/d; /^proc\s+\/proc\s+proc\s+defaults\s+/d' /etc/fstab || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Services we install by default, and which are controlled by presets.
|
# We reset the enablement of all services upon initial installation
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1118740#c23
|
||||||
|
# This will fix up enablement of any preset services that got installed
|
||||||
|
# before systemd due to rpm ordering problems:
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1647172
|
||||||
if [ $1 -eq 1 ] ; then
|
if [ $1 -eq 1 ] ; then
|
||||||
systemctl preset --quiet \
|
systemctl preset-all &>/dev/null || :
|
||||||
remote-fs.target \
|
|
||||||
getty@.service \
|
|
||||||
serial-getty@.service \
|
|
||||||
console-getty.service \
|
|
||||||
debug-shell.service \
|
|
||||||
systemd-networkd.service \
|
|
||||||
systemd-networkd-wait-online.service \
|
|
||||||
systemd-resolved.service \
|
|
||||||
>/dev/null || :
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# remove obsolete systemd-readahead file
|
# remove obsolete systemd-readahead file
|
||||||
@ -697,7 +692,10 @@ fi
|
|||||||
%files tests -f .file-list-tests
|
%files tests -f .file-list-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Nov 05 2018 Adam Williamson <awilliam@redhat.com> - 239-8.git9f3aed1
|
* Thu Nov 8 2018 Adam Williamson <awilliam@redhat.com> - 239-9.git9f3aed1
|
||||||
|
- Go back to using systemctl preset-all in %post (#1647172, #1118740)
|
||||||
|
|
||||||
|
* Mon Nov 5 2018 Adam Williamson <awilliam@redhat.com> - 239-8.git9f3aed1
|
||||||
- Requires(post) openssl-libs to fix live image build machine-id issue
|
- Requires(post) openssl-libs to fix live image build machine-id issue
|
||||||
See: https://pagure.io/dusty/failed-composes/issue/960
|
See: https://pagure.io/dusty/failed-composes/issue/960
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user