| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 6f799f1f0e68cc7bf89c0a56aec5ecf46937619d Mon Sep 17 00:00:00 2001 |
| 2 | From: Ricardo Salveti <rsalveti@rsalveti.net> |
| 3 | Date: Thu, 15 Jun 2017 10:02:38 -0300 |
| 4 | Subject: [PATCH] dns/resolved: also check for /etc/resolv-conf.systemd |
| 5 | |
| 6 | OE specific resolv.conf path, so it can be enabled by default if available. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [OE config specific] |
| 9 | |
| 10 | Signed-off-by: Ricardo Salveti <rsalveti@rsalveti.net> |
| 11 | --- |
| 12 | src/dns-manager/nm-dns-manager.c | 1 + |
| 13 | 1 file changed, 1 insertion(+) |
| 14 | |
| 15 | diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c |
| 16 | index c1d2bf7..d70d4b4 100644 |
| 17 | --- a/src/dns-manager/nm-dns-manager.c |
| 18 | +++ b/src/dns-manager/nm-dns-manager.c |
| 19 | @@ -1596,6 +1596,7 @@ _resolvconf_resolved_managed (void) |
| 20 | "/run/systemd/resolve/resolv.conf", |
| 21 | "/lib/systemd/resolv.conf", |
| 22 | "/usr/lib/systemd/resolv.conf", |
| 23 | + "/etc/resolv-conf.systemd", |
| 24 | }; |
| 25 | GFile *f; |
| 26 | GFileInfo *info; |
| 27 | -- |
| 28 | 2.7.4 |
| 29 | |