arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 06:48:07 +00:00
Code Issues Releases Wiki Activity

corrected function indentation

Browse Source 
Signed-off-by: RamSet <RamSet@gmail.com>
This commit is contained in:
RamSet 2018-07-17 20:46:18 -06:00
parent bb33427c79
commit 5aea7eb860
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
automated install/basic-install.sh
View File

@ -1502,21 +1502,21 @@ disable_dnsmasq() {
${SUDO} sed -r -i.orig '/#?dns=dnsmasq/d' /etc/NetworkManager/NetworkManager.conf
echo -e " ${TICK} Restarting Network manager"
${SUDO} systemctl reload-or-restart NetworkManager
else
# Disabling dnsmasq via systemctl
echo -e " ${INFO} Disabling dnsmasq via systemctl"
${SUDO} systemctl disable dnsmasq &> /dev/null
fi
#setting dnsmasq_flag to false in order for the next check to validate or not
dnsmasq_flag=false
echo -e " ${INFO} Checking if dnsmasq is still running"
silent_port_53_check
if [[ $dnsmasq_flag = "true" ]]; then
echo -e " ${EXCL} dnsmasq still active, this is most likely due to the fact that ${COL_LIGHT_RED}dnsmasq"
echo -e " was loaded via a non convetional method. This might cause future conflicts with FTLDNS${COL_NC}"
${SUDO} pkill dnsmasq
echo -e " ${TICK} dnsmasq process killed"
fi
else
# Disabling dnsmasq via systemctl
echo -e " ${INFO} Disabling dnsmasq via systemctl"
${SUDO} systemctl disable dnsmasq &> /dev/null
fi
#setting dnsmasq_flag to false in order for the next check to validate or not
dnsmasq_flag=false
echo -e " ${INFO} Checking if dnsmasq is still running"
silent_port_53_check
if [[ $dnsmasq_flag = "true" ]]; then
echo -e " ${EXCL} dnsmasq still active, this is most likely due to the fact that ${COL_LIGHT_RED}dnsmasq"
echo -e " was loaded via a non convetional method. This might cause future conflicts with FTLDNS${COL_NC}"
${SUDO} pkill dnsmasq
echo -e " ${TICK} dnsmasq process killed"
fi
else
echo -e " ${INFO} dnsmasq is not enabled"
fi