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

move & clarify comments

Browse Source
This commit is contained in:
Rob Gill 2018-05-21 08:16:53 +10:00 committed by GitHub
parent 8cfe89604a
commit 20ccb7b558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
automated install/basic-install.sh
View File

@ -1266,8 +1266,6 @@ check_service_active() {
} }
# Systemd-resolved's DNSStubListener and dnsmasq can't share port 53. # Systemd-resolved's DNSStubListener and dnsmasq can't share port 53.
# Resolved needs to remain in place for installer to download needed files,
# so this change needs to be made after installation is complete, but before resarting dnsmasq/ftl
disable_resolved_stublistener() { disable_resolved_stublistener() {
echo -en " ${INFO} Testing if systemd-resolved is enabled" echo -en " ${INFO} Testing if systemd-resolved is enabled"
# Check if Systemd-resolved's DNSStubListener is enabled and active on port 53 # Check if Systemd-resolved's DNSStubListener is enabled and active on port 53
@ -2316,8 +2314,11 @@ main() {
fi fi
fi fi
echo -e " ${INFO} Restarting services..." # Check for and disable systemd-resolved-DNSStubListener before reloading resolved
# Start services # DNSStubListener needs to remain in place for installer to download needed files,
# so this change needs to be made after installation is complete,
# but before starting or resarting the dnsmasq or ftl services
disable_resolved_stublistener
# If the Web server was installed, # If the Web server was installed,
if [[ "${INSTALL_WEB_SERVER}" == true ]]; then if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
@ -2330,8 +2331,8 @@ main() {
fi fi
fi fi
# Check for and if necessary disable systemd-resolved-DNSStubListener echo -e " ${INFO} Restarting services..."
disable_resolved_stublistener # Start services
# Enable FTL # Enable FTL
start_service pihole-FTL start_service pihole-FTL