From: Simon McVittie <simon.mcvittie@collabora.co.uk>

Date: Tue, 21 Jun 2016 18:18:45 +0100
Subject: abstractions/nameservice: also support ConnMan-managed resolv.conf

Follow the same logic we already did for NetworkManager,
resolvconf and systemd-resolved. The wonderful thing about
standards is that there are so many to choose from.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Seth Arnold 2016-06-22 15:15:49 -07:00
parent 939587178b
commit 787ced1969

View file

@ -33,13 +33,9 @@
/var/lib/sss/pipes/nss rw,
/etc/resolv.conf r,
# on systems using resolvconf, /etc/resolv.conf is a symlink to
# /{,var/}run/resolvconf/resolv.conf and a file sometimes referenced in
# /etc/resolvconf/run/resolv.conf. Similarly, if NetworkManager is used
# without resolvconf, /etc/resolv.conf is a symlink to its own resolv.conf.
# Finally, on systems using systemd's networkd, /etc/resolv.conf is
# a symlink to /run/systemd/resolve/resolv.conf
/{,var/}run/{resolvconf,NetworkManager,systemd/resolve}/resolv.conf r,
# On systems where /etc/resolv.conf is managed programmatically, it is
# a symlink to /{,var/}run/(whatever program is managing it)/resolv.conf.
/{,var/}run/{resolvconf,NetworkManager,systemd/resolve,connman}/resolv.conf r,
/etc/resolvconf/run/resolv.conf r,
/etc/samba/lmhosts r,