tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2163 from pi-hole/fix/supressDnsmasqWarning 

Fix for an error message introduced in #2162
This commit is contained in:
Adam Warner 2018-05-07 20:44:39 +01:00 committed by GitHub
parent 90239bb969 76654c7856
commit 4e0c7ed5a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
automated install/basic-install.sh
View File

@ -1933,11 +1933,13 @@ FTLinstall() {
popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; } popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
# Install the FTL service # Install the FTL service
echo -e "${OVER} ${TICK} ${str}" echo -e "${OVER} ${TICK} ${str}"
# dnsmasq can now be stopped and disabled # dnsmasq can now be stopped and disabled if it exists
if check_service_active "dnsmasq";then if which dnsmasq > /dev/null; then
echo " ${INFO} FTL can now resolve DNS Queries without dnsmasq running separately" if check_service_active "dnsmasq";then
stop_service dnsmasq echo " ${INFO} FTL can now resolve DNS Queries without dnsmasq running separately"
disable_service dnsmasq stop_service dnsmasq
disable_service dnsmasq
fi
fi fi
#ensure /etc/dnsmasq.conf contains `conf-dir=/etc/dnsmasq.d` #ensure /etc/dnsmasq.conf contains `conf-dir=/etc/dnsmasq.d`
@ -2051,9 +2053,11 @@ FTLcheckUpdate()
local remoteSha1 local remoteSha1
local localSha1 local localSha1
# if dnsmasq is running at this point, force reinstall of FTL Binary # if dnsmasq exists and is running at this point, force reinstall of FTL Binary
if check_service_active "dnsmasq";then if which dnsmasq > /dev/null; then
return 0 if check_service_active "dnsmasq";then
return 0
fi
fi fi
if [[ ! "${ftlBranch}" == "master" ]]; then if [[ ! "${ftlBranch}" == "master" ]]; then