Merge pull request #1927 from pi-hole/development

development -> master for tagging

Author: PromoFaux

.github/workflows/editorconfig.yml

@@ -12,7 +12,7 @@ jobs:
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
 
     - name: Get editorconfig-checker
-      uses: editorconfig-checker/action-editorconfig-checker@4b6cd6190d435e7e084fb35e36a096e98506f7b9 # tag v2. is really out of date
+      uses: editorconfig-checker/action-editorconfig-checker@4b6cd6190d435e7e084fb35e36a096e98506f7b9 #v2.1.0
 
     - name: Run editorconfig-checker
       run: editorconfig-checker

src/start.sh

@@ -70,18 +70,18 @@ start() {
     # We need the PID of the capsh process so that we can wait for it to finish
     CAPSH_PID=$!
 
+    # Get the FTL log file path from the config
+    FTLlogFile=$(getFTLConfigValue files.log.ftl)
+
     # Wait until the log file exists before continuing
-    while [ ! -f /var/log/pihole/FTL.log ]; do
+    while [ ! -f "${FTLlogFile}" ]; do
         sleep 0.5
     done
 
-    # Wait until the FTL log contains the "FTL started" message before continuing, timeout after 10 seconds
-    # exit if we do not find it
-    pihole-FTL wait-for '########## FTL started' /var/log/pihole/FTL.log 10 0 > /dev/null
-    if [ $? -ne 0 ]; then
-        echo "  [✗] FTL did not start - stopping container"
-        exit 1
-    fi
+    #  Wait until the FTL log contains the "FTL started" message before continuing
+    while ! grep -q '########## FTL started' "${FTLlogFile}"; do
+        sleep 0.5
+    done
 
     pihole updatechecker
     local versionsOutput