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>
This commit is contained in:
@@ -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
|
||||
fi
|
||||
|
||||
if [[ "${DHCP_ACTIVE}" != "" ]] ; then
|
||||
# Look for DHCP server settings which would have to be reapplied
|
||||
ProcessDHCPSettings
|
||||
fi
|
||||
ProcessDNSSettings
|
||||
|
||||
# Look for DHCP server settings which would have to be reapplied
|
||||
ProcessDHCPSettings
|
||||
}
|
||||
|
||||
# Install the logrotate script
|
||||
|
Reference in New Issue
Block a user