Always process DNS and DHCP settings in installer (#1630)

* Always process DNS and DHCP settings in installer

* Make sure dnsmasq config exists before modifying it

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

* Make sure the dnsmasq config directory exists

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

* Only remove the DHCP config if it exists (fixes tests, hopefully)

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

advanced/Scripts/webpage.sh

@@ -292,7 +292,9 @@ ra-param=*,0,0
     fi
 
 	else
-		rm "${dhcpconfig}" &> /dev/null
+	  if [[ -f "${dhcpconfig}" ]]; then
+		  rm "${dhcpconfig}" &> /dev/null
+		fi
 	fi
 }
 

automated install/basic-install.sh

@@ -1503,16 +1503,11 @@ finalExports() {
   source "${setupVars}"
   source "${PI_HOLE_LOCAL_REPO}/advanced/Scripts/webpage.sh"
 
-  if [[ "${DNS_FQDN_REQUIRED}" != "" ]] ; then
   # Look for DNS server settings which would have to be reapplied
-    ProcessDNSSettings
+  ProcessDNSSettings
-  fi
-
-  if [[ "${DHCP_ACTIVE}" != "" ]] ; then
-    # Look for DHCP server settings which would have to be reapplied
-    ProcessDHCPSettings
-  fi
 
+  # Look for DHCP server settings which would have to be reapplied
+  ProcessDHCPSettings
 }
 
 # Install the logrotate script

test/test_automated_install.py

@@ -59,6 +59,8 @@ def test_setupVars_saved_to_file(Pihole):
     TERM=xterm
     source /opt/pihole/basic-install.sh
     {}
+    mkdir -p /etc/dnsmasq.d
+    version_check_dnsmasq
     finalExports
     cat /etc/pihole/setupVars.conf
     '''.format(set_setup_vars))