2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 13:58:22 +00:00

merge from intrigeri

support systems with NetworkManager but no resolvconf where /etc/resolv.conf is
a symlink to /var/run/NetworkManager/resolv.conf

Patch proposed by Simon McVittie <smcv@debian.org>.
Bug-Debian: #813835

Acked-By: Jamie Strandboge <jamie@canonical.com>
This commit is contained in:
Jamie Strandboge
2016-02-10 09:57:58 -06:00

View File

@@ -35,12 +35,12 @@
/etc/resolv.conf r, /etc/resolv.conf r,
# on systems using resolvconf, /etc/resolv.conf is a symlink to # on systems using resolvconf, /etc/resolv.conf is a symlink to
# /{,var/}run/resolvconf/resolv.conf and a file sometimes referenced in # /{,var/}run/resolvconf/resolv.conf and a file sometimes referenced in
# /etc/resolvconf/run/resolv.conf # /etc/resolvconf/run/resolv.conf. Similarly, if NetworkManager is used
/{,var/}run/resolvconf/resolv.conf r, # 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,
/etc/resolvconf/run/resolv.conf r, /etc/resolvconf/run/resolv.conf r,
# on systems using systemd's networkd, /etc/resolv.conf is a symlink to
# /run/systemd/resolve/resolv.conf
/{,var/}run/systemd/resolve/resolv.conf r,
/etc/samba/lmhosts r, /etc/samba/lmhosts r,
/etc/services r, /etc/services r,