Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-21 06:40:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

2
test/test_automated_install.py
View file

@ -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))