From 2ffb1a8a5fb49de9ce732de61182dfbc1d2d81f3 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Wed, 2 Oct 2019 13:16:47 +0200 Subject: [PATCH] Use conf.d for the NetworkManager config This moves the parts of the NetworkManager config that appear to be important to a surface-specific file in conf.d. That way, no config is overwritten when installing the files. Signed-off-by: Dorian Stoll --- root/etc/NetworkManager/NetworkManager.conf | 12 ------------ root/etc/NetworkManager/conf.d/99-surface.conf | 5 +++++ .../conf.d/default-wifi-powersave-on.conf | 2 -- 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 root/etc/NetworkManager/NetworkManager.conf create mode 100644 root/etc/NetworkManager/conf.d/99-surface.conf delete mode 100644 root/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf diff --git a/root/etc/NetworkManager/NetworkManager.conf b/root/etc/NetworkManager/NetworkManager.conf deleted file mode 100644 index efbd970a6..000000000 --- a/root/etc/NetworkManager/NetworkManager.conf +++ /dev/null @@ -1,12 +0,0 @@ -[main] -plugins=ifupdown,keyfile,ofono -#dns=dnsmasq - -[ifupdown] -managed=false - -[connection] -wifi.powersave = 2 - -[device] -wifi.scan-rand-mac-address=false diff --git a/root/etc/NetworkManager/conf.d/99-surface.conf b/root/etc/NetworkManager/conf.d/99-surface.conf new file mode 100644 index 000000000..c34a6825c --- /dev/null +++ b/root/etc/NetworkManager/conf.d/99-surface.conf @@ -0,0 +1,5 @@ +[connection] +wifi.powersave = 2 + +[device] +wifi.scan-rand-mac-address=false diff --git a/root/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf b/root/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf deleted file mode 100644 index 111af0beb..000000000 --- a/root/etc/NetworkManager/conf.d/default-wifi-powersave-on.conf +++ /dev/null @@ -1,2 +0,0 @@ -[connection] -wifi.powersave = 2