From ffd3cbb94463a809eeec7c06454fb452c824f7e6 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 26 Oct 2025 13:04:23 +0000 Subject: [PATCH 1/3] Revert FTL wait-for changes Signed-off-by: Adam Warner --- src/start.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/start.sh b/src/start.sh index fe7724a..7036cee 100644 --- a/src/start.sh +++ b/src/start.sh @@ -75,13 +75,10 @@ start() { 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' /var/log/pihole/FTL.log; do + sleep 0.5 + done pihole updatechecker local versionsOutput From 2d879730d2195245b165000608873c08c3d4e7f3 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Sun, 26 Oct 2025 14:10:42 +0100 Subject: [PATCH 2/3] Don't use hard-coded FTL.log path Signed-off-by: yubiuser --- src/start.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/start.sh b/src/start.sh index 7036cee..a6fa83b 100644 --- a/src/start.sh +++ b/src/start.sh @@ -70,13 +70,16 @@ 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 - while ! grep -q '########## FTL started' /var/log/pihole/FTL.log; do + while ! grep -q '########## FTL started' "${FTLlogFile}"; do sleep 0.5 done From f0c19e5f23d5c95cf362c194c6490ec56ce9ab91 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Sun, 26 Oct 2025 20:18:46 +0100 Subject: [PATCH 3/3] Start using commented tags for editorconfig-checker Signed-off-by: yubiuser --- .github/workflows/editorconfig.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 33c2d5c..9e39de6 100644 --- a/.github/workflows/editorconfig.yml +++ b/.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