Merge pull request #1234 from pi-hole/updatechecktiming

Ensure FTL is running before attempting to run functions/lines that require DNS resolution to be working

Author: PromoFaux

Diff for: src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up

@@ -0,0 +1,2 @@
+#!/command/execlineb
+background { bash -e /usr/local/bin/_postFTL.sh }

Diff for: src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/dependencies.d/lighttpd renamed to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/dependencies.d/lighttpd

@@ -1,4 +1,5 @@
 #!/bin/bash
+# This script contains function calls and lines that may rely on pihole-FTL to be running, it is run as part of a oneshot service on container startup
 
 if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then
     set -x ;
@@ -20,4 +21,13 @@ if [ -z "$SKIPGRAVITYONBOOT" ] || [ ! -f "${gravityDBfile}" ]; then
     pihole -g
 else
     echo "  Skipping Gravity Database Update."
-fi
+fi
+
+# Run update checker to check for newer container, and display version output
+echo ""
+pihole updatechecker
+pihole -v
+
+DOCKER_TAG=$(cat /pihole.docker.tag)
+echo "  Container tag is: ${DOCKER_TAG}"
+echo ""

Diff for: src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/dependencies.d/pihole-FTL renamed to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/dependencies.d/pihole-FTL

@@ -69,9 +69,6 @@ test_configs
 echo "  [i] Docker start setup complete"
 echo ""
 
-pihole -v
 
-echo "  Container tag is: ${PIHOLE_DOCKER_TAG}"
-echo ""
 echo "  [i] pihole-FTL ($FTL_CMD) will be started as ${DNSMASQ_USER}"
 echo ""

Diff for: src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/type renamed to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_postFTL/type

@@ -100,9 +100,6 @@ ensure_basic_configuration() {
     chown pihole:root "${PI_HOLE_BIN_DIR}/pihole"
 
     set -e
-    # Update version numbers
-    pihole updatechecker
-    pihole updatechecker remote
     # Re-write all of the setupVars to ensure required ones are present (like QUERY_LOGGING)
 
     # If the setup variable file exists,