Do not touch /etc/resolv.conf on upgrades

(cherry-picked from 4047e4fb7b)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-04-12 09:50:37 +02:00
parent a69e3c53bf
commit 5be6189564
1 changed files with 9 additions and 2 deletions

View File

@ -31,7 +31,7 @@ Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
%if %{without inplace}
Version: 250.9
Release: 1%{?dist}
Release: 2%{?dist}
%else
# determine the build information from local checkout
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
@ -917,7 +917,8 @@ if [ $1 -eq 0 ] ; then
fi
%post resolved
[ $1 -gt 1 ] && exit 0
[ $1 -eq 1 ] || exit 0
# Initial installation
# Related to https://bugzilla.redhat.com/show_bug.cgi?id=1943263
if ls /usr/lib/systemd/libsystemd-shared-24[0-8].so &>/dev/null; then
@ -928,6 +929,9 @@ fi
%systemd_post systemd-resolved.service
%posttrans resolved
[ $1 -eq 1 ] || exit 0
# Initial installation
# Create /etc/resolv.conf symlink.
# We would also create it using tmpfiles, but let's do this here
# too before NetworkManager gets a chance. (systemd-tmpfiles invocation above
@ -1010,6 +1014,9 @@ fi
%files standalone-sysusers -f .file-list-standalone-sysusers
%changelog
* Sun Jan 29 2023 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 250.9-2
- Do not touch /etc/resolv.conf on upgrades (#2074122)
* Tue Dec 20 2022 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 250.9-1
- Latest bugfix release with a bunch of fixes (homed, networkd, manager,
resolved, documentation): rhbz#2133792, rhbz#2135778, rhbz#2152685,