fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 10:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: check for relative paths and stub-resolve.conf when detecting systemd-resolved

Browse source 
Fix resolved detection, the symlink target is usually relative to the
root, such that in chroots the file points to a file inside the
chroot. But keep absolute targets too, as these may have been in use
with older version of systemd. Add support for stub-resolv.conf
detection.

https://bugzilla.gnome.org/show_bug.cgi?id=790446
(cherry picked from commit e09503dcc4)
This commit is contained in:
Dimitri John Ledkov 2017-11-19 13:07:13 +01:00 • committed by Thomas Haller
parent a2e0c92901
commit 4d77df7751
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dns/nm-dns-manager.c
View file

@ -1535,6 +1535,11 @@ static gboolean
_resolvconf_resolved_managed (void)
{
static const char *const RESOLVED_PATHS[] = {
"../run/systemd/resolve/stub-resolv.conf",
"../run/systemd/resolve/resolv.conf",
"../lib/systemd/resolv.conf",
"../usr/lib/systemd/resolv.conf",
"/run/systemd/resolve/stub-resolv.conf",
"/run/systemd/resolve/resolv.conf",
"/lib/systemd/resolv.conf",
"/usr/lib/systemd/resolv.conf",