mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-21 18:24:49 +00:00
dns: check for relative paths and stub-resolve.conf when detecting systemd-resolved
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
This commit is contained in:
parent
60334a2893
commit
e09503dcc4
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue