arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-03 12:40:56 +00:00
Code Issues Releases Wiki Activity

Additionally mask the dnsmasq service on systems with systemctl

Browse Source 
Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2018-03-14 20:01:06 +00:00
parent 84bd86f1ee
commit b92ccb2de4
No known key found for this signature in database
GPG Key ID: F5410858022DA5EB
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
automated install/basic-install.sh
View File

@ -1173,6 +1173,25 @@ disable_service() {
echo -e "${OVER} ${TICK} ${str}"
}
# Mask service so that it cannot be started accidentally
mask_service() {
# Local, named variables
local str="Masking ${1} service"
echo -ne " ${INFO} ${str}..."
# If systemctl exists,
if command -v systemctl &> /dev/null; then
# use that to disable the service
systemctl mask "${1}" &> /dev/null
echo -e "${OVER} ${TICK} ${str}"
# Othwerwise,
else
# use update-rc.d to accomplish this
echo -e "${OVER} ${CROSS} ${str}"
echo -e " ${INFO} systemctl not detected. Cannot mask service."
fi
}
check_service_active() {
# If systemctl exists,
if command -v systemctl &> /dev/null; then
@ -1831,7 +1850,8 @@ FTLinstall() {
if check_service_active "dnsmasq";then
echo " ${INFO} FTL can now resolve DNS Queries without dnsmasq running separately"
stop_service dnsmasq
disable_service dnsmasq
disable_service dnsmasq
mask_service dnsmasq
fi
fi