Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2381 from pi-hole/fix/existing_dnsmasq.conf

Browse source 
Improve /etc/dnsmasq.conf handling
This commit is contained in:
Mark Drobnak 2018-08-25 18:55:12 -05:00 committed by GitHub
commit 667c5138cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
automated install/basic-install.sh
View file

@ -2109,12 +2109,15 @@ FTLinstall() {
fi fi
fi fi
#ensure /etc/dnsmasq.conf contains `conf-dir=/etc/dnsmasq.d` # Backup existing /etc/dnsmasq.conf if present and ensure that
confdir="conf-dir=/etc/dnsmasq.d" # /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d"
conffile="/etc/dnsmasq.conf" local conffile="/etc/dnsmasq.conf"
if ! grep -q "$confdir" "$conffile"; then if [[ -f "${conffile}" ]]; then
echo "$confdir" >> "$conffile" echo " ${INFO} Backing up ${conffile} to ${conffile}.old"
mv "${conffile}" "${conffile}.old"
fi fi
# Create /etc/dnsmasq.conf
echo "conf-dir=/etc/dnsmasq.d" > "${conffile}"
return 0 return 0
# Otherwise, # Otherwise,