rpms
/
systemd
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Avoid trying to create the symlink if there's a dangling symlink already" 

This reverts commit 9c9b28cd91.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-04-12 10:11:03 +02:00
parent 0c79c0aff9
commit 5f6666c925
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
systemd.spec
View File

@ -961,11 +961,11 @@ if systemctl -q is-enabled systemd-resolved.service &>/dev/null &&
! systemd-analyze cat-config systemd/resolved.conf 2>/dev/null |
grep -iqE '^DNSStubListener\s*=\s*(no?|false|0|off)\s*$'; then
if ! test -e /etc/resolv.conf && ! test -L /etc/resolv.conf; then
ln -sv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf || :
if ! test -e /etc/resolv.conf; then
ln -sv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
elif test -d /run/systemd/system/ &&
! mountpoint /etc/resolv.conf &>/dev/null; then
ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf || :
ln -fsv ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
fi
fi
@ -1024,6 +1024,8 @@ fi
%changelog
* Tue Apr 12 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 249.11-2
- Do not touch /etc/resolv.conf on upgrades (#2074122)
- Undo the change to "create /etc/resolv.conf symlink if nothing is
present yet" (#2074083)
* Wed Apr 6 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 249.11-1
- Update to latest bugfix release (#2039854)