Make sure not to lose systemd-networkd enablement when upgrading from F32
This commit is contained in:
parent
65248cc181
commit
d6a1608082
21
systemd.spec
21
systemd.spec
|
@ -21,7 +21,7 @@
|
||||||
Name: systemd
|
Name: systemd
|
||||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||||
Version: 248~rc4
|
Version: 248~rc4
|
||||||
Release: 4%{?dist}
|
Release: 5%{?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
|
||||||
|
@ -914,7 +914,20 @@ getent group systemd-network &>/dev/null || groupadd -r -g 192 systemd-network 2
|
||||||
getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-network -d / -s /sbin/nologin -c "systemd Network Management" systemd-network &>/dev/null || :
|
getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-network -d / -s /sbin/nologin -c "systemd Network Management" systemd-network &>/dev/null || :
|
||||||
|
|
||||||
%post networkd
|
%post networkd
|
||||||
%systemd_post systemd-networkd.service systemd-networkd-wait-online.service
|
# systemd-networkd was split out in systemd-246.6-2.
|
||||||
|
# Ideally, we would have a trigger scriptlet to record enablement
|
||||||
|
# state when upgrading from systemd <= systemd-246.6-1. But, AFAICS,
|
||||||
|
# rpm doesn't allow us to trigger on another package, short of
|
||||||
|
# querying the rpm database ourselves, which seems risky. For rpm,
|
||||||
|
# systemd and systemd-networkd are completely unrelated. So let's use
|
||||||
|
# a hack to detect if an old systemd version is currently present in
|
||||||
|
# the file system.
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1943263
|
||||||
|
if [ $1 -eq 1 ] && ls /usr/lib/systemd/libsystemd-shared-24[0-6].so &>/dev/null; then
|
||||||
|
echo "Skipping presets for systemd-networkd.service, seems we are upgrading from old systemd."
|
||||||
|
else
|
||||||
|
%systemd_post systemd-networkd.service systemd-networkd-wait-online.service
|
||||||
|
fi
|
||||||
|
|
||||||
%preun networkd
|
%preun networkd
|
||||||
%systemd_preun systemd-networkd.service systemd-networkd-wait-online.service
|
%systemd_preun systemd-networkd.service systemd-networkd-wait-online.service
|
||||||
|
@ -968,6 +981,10 @@ getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-net
|
||||||
%files standalone-sysusers -f .file-list-standalone-sysusers
|
%files standalone-sysusers -f .file-list-standalone-sysusers
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 26 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248~rc4-5
|
||||||
|
- Do not preset systemd-networkd.service and systemd-networkd-wait-online.service
|
||||||
|
on upgrades from before systemd-networkd was split out (#1943263)
|
||||||
|
|
||||||
* Wed Mar 24 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248~rc4-4
|
* Wed Mar 24 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 248~rc4-4
|
||||||
- Revert patch that seems to cause problems with dns resolution
|
- Revert patch that seems to cause problems with dns resolution
|
||||||
(see comments on https://bodhi.fedoraproject.org/updates/FEDORA-2021-1c1a870ceb)
|
(see comments on https://bodhi.fedoraproject.org/updates/FEDORA-2021-1c1a870ceb)
|
||||||
|
|
Loading…
Reference in New Issue