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:
Mcat12 2017-07-26 12:15:23 -04:00 committed by Adam Warner
parent c02a24cf71
commit b09c660833
3 changed files with 8 additions and 9 deletions

View file

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