Commit e09503dc authored by Dimitri John Ledkov's avatar Dimitri John Ledkov Committed by Thomas Haller
Browse files

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
parent 60334a28
......@@ -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",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment