diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2016-06-10 14:06:38 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2016-06-10 14:32:28 +0200 |
| commit | 040b37ed53e7c6a296a92aa81d0dd857a6ed8dd6 (patch) | |
| tree | 84b1a0aa537b9e8c74b15cf27ace48470af8bcaf /projectroot | |
| parent | 40502cf430ef3882c1d9e97f2fd7b023e46a8eb8 (diff) | |
| download | DistroKit-040b37ed53e7c6a296a92aa81d0dd857a6ed8dd6.tar.gz DistroKit-040b37ed53e7c6a296a92aa81d0dd857a6ed8dd6.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.
This patch has been sent upstream.
Found-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'projectroot')
| -rw-r--r-- | projectroot/etc/NetworkManager/NetworkManager.conf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/projectroot/etc/NetworkManager/NetworkManager.conf b/projectroot/etc/NetworkManager/NetworkManager.conf new file mode 100644 index 0000000..d518223 --- /dev/null +++ b/projectroot/etc/NetworkManager/NetworkManager.conf @@ -0,0 +1,6 @@ +[main] +plugins=ifupdown,keyfile +rc-manager=file + +[ifupdown] +managed=false |