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 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

versionCheckDNSmasq() fixups

Browse source 
versionCheckDNSmasq() fixups per dschaper's suggestions.
This commit is contained in:
Chad Howell 2016-01-25 01:27:10 -05:00
parent a21948d2c6
commit ac373545d0
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
automated install/basic-install.sh
View file

@ -282,12 +282,22 @@ setDNS(){
versionCheckDNSmasq(){ versionCheckDNSmasq(){
# Check if /etc/dnsmasq.conf is from pihole. If so replace with an original and install new in .d directory # Check if /etc/dnsmasq.conf is from pihole. If so replace with an original and install new in .d directory
dnsFile="/etc/dnsmasq.conf" dnsFile1="/etc/dnsmasq.conf"
dnsFile2="/etc/dnsmasq.conf"
dnsSearch="addn-hosts=/etc/pihole/gravity.list" dnsSearch="addn-hosts=/etc/pihole/gravity.list"
if grep -q $dnsSearch $dnsFile; then # Check dnsmasq.conf for pihole magic
$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig if grep -q $dnsSearch $dnsFile1; then
$SUDO cp /etc/.pihole/advanced/dnsmasq.conf.original /etc/dnsmasq.conf # If true, Check dnsmasq.conf.orig for pihole magic
if grep -q $dnsSearch $dnsFile1; then
# If true, use advanced/dnsmasq.conf.original
$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
$SUDO cp /etc/.pihole/advanced/dnsmasq.conf.original /etc/dnsmasq.conf
else
# If false, mv original file back
$SUDO mv /etc/dnsmasq.conf /etc/dnsmasq.conf.orig
fi
# If false, This is a fresh install
fi fi
$SUDO cp /etc/.pihole/advanced/01-pihole.conf /etc/dnsmasq.d/01-pihole.conf $SUDO cp /etc/.pihole/advanced/01-pihole.conf /etc/dnsmasq.d/01-pihole.conf
$SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.d/01-pihole.conf $SUDO sed -i "s/@INT@/$piholeInterface/" /etc/dnsmasq.d/01-pihole.conf