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

Upgrades: only replace NM /etc/resolv.conf if NM is enabled

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-09-29 18:30:47 +02:00
parent ce6da66f61
commit 3905512117
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
systemd.spec
View File

@ -684,7 +684,9 @@ fi
# This is for upgrades from previous versions before systemd-resolved became the default.
systemctl --no-reload preset systemd-resolved.service &>/dev/null || :
if systemctl is-enabled systemd-resolved.service &>/dev/null; then
if systemctl -q is-enabled systemd-resolved.service &>/dev/null; then
systemctl -q is-enabled NetworkManager.service 2>/dev/null && \
! test -L /etc/resolv.conf 2>/dev/null && \
grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \
echo -e '/etc/resolv.conf was generated by NetworkManager.\nRemoving it to let systemd-resolved manage this file.' && \
mv -v /etc/resolv.conf /etc/resolv.conf.orig-with-nm && \