X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=trusted-network;h=d065009ff547e96ed96a7485b42bd30af6203e15;hb=8de1e14e35d0ad62620a59f6e2ca4ba19ddcda3c;hp=a4325339c541c7db0c11c75dc8d16802cfae312d;hpb=ee27d59f1eea7a83b1764ec41bfb3015bb463a26;p=distro-setup

diff --git a/trusted-network b/trusted-network
index a432533..d065009 100755
--- a/trusted-network
+++ b/trusted-network
@@ -101,10 +101,33 @@ EOF
   fi
 fi
 
+# t11 uses dhclient.conf
 dhclient_restart=false
 # man dhclient.conf
-if ! grep -qP '\bdomain-name-servers\b' /etc/dhcp/dhclient.conf; then
-  sed -i 's/^ *request/request domain-name-servers,/' /etc/dhcp/dhclient.conf
+f=/etc/dhcp/dhclient.conf
+if [[ -e $f ]]; then
+  if $trust; then
+    if ! grep -qP '\bdomain-name-servers\b' $f; then
+      sed -i 's/^ *request/request domain-name-servers,/' $f
+      dhclient_restart=true
+      e $0: dhclient_restart=true
+    fi
+  else
+    if grep -qP '\bdomain-name-servers\b' $f; then
+      sed -i 's/^ *request domain-name-servers,/request/' $f
+      dhclient_restart=true
+      e $0: dhclient_restart=true
+    fi
+  fi
+fi
+
+# t12 uses dhclient.conf
+f=/etc/dhcpcd.conf
+# note: haven't tested
+if ! $trust; then
+  line="nooption domain_name_servers"
+fi
+if [[ -e $f ]] && ! echo $line | cedit $f; then
   dhclient_restart=true
   e $0: dhclient_restart=true
 fi
@@ -127,7 +150,7 @@ if [[ $gateway_if ]]; then
   # rm -f /run/systemd/resolved.conf.d/*$gateway_if*
 
 
-  if $dhclient_restart && grep -Pq "^ *auto ($gateway_if|.* $gateway_if( |$))" /etc/network/interfaces; then
+  if $dhclient_restart && grep -Pq "^ *auto ($gateway_if|.* $gateway_if( |$))" /etc/network/interfaces &>/dev/null; then
     m ifdown $gateway_if
     m ifup $gateway_if
   fi