aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xinstall.sh10
-rw-r--r--networkmanager/etc/NetworkManager/conf.d/dns.conf2
2 files changed, 11 insertions, 1 deletions
diff --git a/install.sh b/install.sh
index 354443a..98f2ac5 100755
--- a/install.sh
+++ b/install.sh
@@ -114,12 +114,20 @@
#tpac -S phpbrew libxslt
#phpbrew init
+# Add conf for dnsmaqs but don't enable it
+# DHCP and DNS are managed by NetworkManager
#tpac -S dnsmasq
#sudo stow -t / dnsmasq
-#sudo systemctl enable dnsmasq.service
+
+#sudo systemctl enable dnsmasq.service # don't do that !
+
+#sudo systemctl disable dhcpcd.service
+
#sudo stow -t / resolv
#sudo resolvconf -u
+#sudo stow -t / networkmanager
+
#tpac -S tig
#tpac -S syncthing
diff --git a/networkmanager/etc/NetworkManager/conf.d/dns.conf b/networkmanager/etc/NetworkManager/conf.d/dns.conf
new file mode 100644
index 0000000..53a8b17
--- /dev/null
+++ b/networkmanager/etc/NetworkManager/conf.d/dns.conf
@@ -0,0 +1,2 @@
+[main]
+dns=dnsmasq