X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=43ca158ae4142b77d4b1e2c4f16aa0d6d0a4ae42;hb=cb16d3950c49e44e40c765db5c50fc4f961fee29;hp=7bc1f4ba52df7d07c0bfef217b54b830140eb209;hpb=2d3ce30754a3f24d922635647bab4990b60f5c27;p=distro-setup

diff --git a/distro-end b/distro-end
index 7bc1f4b..43ca158 100755
--- a/distro-end
+++ b/distro-end
@@ -1475,6 +1475,15 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \
 
 ########### misc stuff
 
+# make networkmanager use resolvconf instead of its own dnsmasq which
+# conflicts with the normal dnsmasq package.
+f=/etc/NetworkManager/NetworkManager.conf
+m=$(md5sum $f)
+s sed -ri '/ *\[main\]/,/^ *\[[^]]+\]/{/^\s*dns[[:space:]=]/d}' $f
+if [[ $m != $(md5sum $f) ]]; then
+  srestart NetworkManager
+fi
+
 # make my /etc/fonts/conf.d/ get used.
 # I have a new sans-serif font there because the default one
 # displays l and I as the same char, grrrrr.
@@ -1533,9 +1542,9 @@ case $distro in
     # compilers.
     spa unison unison-gtk
     ;;
-arch)
-  spa unison gtk2
-  ;;
+  arch)
+    spa unison gtk2
+    ;;
 esac
 
 case $distro in