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

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 ${SUDO} sed -r -i.orig '/#?dns=dnsmasq/d' /etc/NetworkManager/NetworkManager.conf
echo -e " ${TICK} Restarting Network manager" echo -e " ${TICK} Restarting Network manager"
${SUDO} systemctl reload-or-restart NetworkManager ${SUDO} systemctl reload-or-restart NetworkManager
else else
# Disabling dnsmasq via systemctl # Disabling dnsmasq via systemctl
echo -e " ${INFO} Disabling dnsmasq via systemctl" echo -e " ${INFO} Disabling dnsmasq via systemctl"
${SUDO} systemctl disable dnsmasq &> /dev/null ${SUDO} systemctl disable dnsmasq &> /dev/null
fi fi
#setting dnsmasq_flag to false in order for the next check to validate or not #setting dnsmasq_flag to false in order for the next check to validate or not
dnsmasq_flag=false dnsmasq_flag=false
echo -e " ${INFO} Checking if dnsmasq is still running" echo -e " ${INFO} Checking if dnsmasq is still running"
silent_port_53_check silent_port_53_check
if [[ $dnsmasq_flag = "true" ]]; then 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 " ${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}" echo -e " was loaded via a non convetional method. This might cause future conflicts with FTLDNS${COL_NC}"
${SUDO} pkill dnsmasq ${SUDO} pkill dnsmasq
echo -e " ${TICK} dnsmasq process killed" echo -e " ${TICK} dnsmasq process killed"
fi fi
else else
echo -e " ${INFO} dnsmasq is not enabled" echo -e " ${INFO} dnsmasq is not enabled"
fi fi