diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2016-06-10 14:05:28 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-13 13:09:39 +0200 |
| commit | 04d0241cfdb6d31d65e9fa7f3d850451953f0bb3 (patch) | |
| tree | 524538fb8efa641a1a345fd5e0af497a1685f34a /projectroot | |
| parent | 80616579001bf19e5e1069996be9de4447f23d55 (diff) | |
| download | ptxdist-04d0241cfdb6d31d65e9fa7f3d850451953f0bb3.tar.gz ptxdist-04d0241cfdb6d31d65e9fa7f3d850451953f0bb3.tar.xz | |
NetworkManager: fix resolv.conf handling
With NetworkManager 1.2, the /etc/resolv.conf handling was changed and
we didn't notice.
NetworkManager assumes that resolv.conf is already handled manually and
writes its generated resolv.conf only to /run/NetworkManager/resolv.conf
instead of the location we set our /etc/resolv.conf link to.
By setting rc-manager=file, the old behaviour is restored.
Found-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
| -rw-r--r-- | projectroot/etc/NetworkManager/NetworkManager.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/projectroot/etc/NetworkManager/NetworkManager.conf b/projectroot/etc/NetworkManager/NetworkManager.conf index d8b33d914..d5182231c 100644 --- a/projectroot/etc/NetworkManager/NetworkManager.conf +++ b/projectroot/etc/NetworkManager/NetworkManager.conf @@ -1,5 +1,6 @@ [main] plugins=ifupdown,keyfile +rc-manager=file [ifupdown] managed=false |