Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-01-11 22:44:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Call FTL download/installation early on in the installation process.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-01-24 09:36:27 +01:00
parent de6dc90575
commit d90d7b6927
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
automated install/basic-install.sh
View file

@ -1909,8 +1909,9 @@ installPihole() {
installCron installCron
# Install the logrotate file # Install the logrotate file
installLogrotate installLogrotate
# Check if FTL is installed # Check if dnsmasq is present. If so, disable it and back up any possible
FTLdetect || printf " %b FTL Engine not installed\\n" "${CROSS}" # config file
disable_dnsmasq
# Configure the firewall # Configure the firewall
if [[ "${useUpdateVars}" == false ]]; then if [[ "${useUpdateVars}" == false ]]; then
configureFirewall configureFirewall
@ -2539,6 +2540,8 @@ main() {
else else
LIGHTTPD_ENABLED=false LIGHTTPD_ENABLED=false
fi fi
# Check if FTL is installed - do this early on as FTL is a hard dependency for Pi-hole
FTLdetect || printf " %b FTL Engine not installed\\n" "${CROSS}"
# Install and log everything to a file # Install and log everything to a file
installPihole | tee -a /proc/$$/fd/3 installPihole | tee -a /proc/$$/fd/3