From a575f6e12195656123169b5d377cf77ab9956207 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 18 Jul 2026 10:09:08 +0200
Subject: [PATCH 1/6] scrutiny: remove unsupported s6 startup wait

---
 scrutiny/Dockerfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 225e41bd91..1f53a04583 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -35,6 +35,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" -o -name "finish" \) -print -exec chmod +x {} \;
 
+# The Home Assistant entrypoint starts services directly instead of running s6.
+# Scrutiny's collector already waits for the API health endpoint, so remove its s6-only wait.
+RUN if grep -q 's6-svwait -u /run/service/scrutiny' /etc/services.d/collector-once/run; then \
+        sed -i '\|s6-svwait -u /run/service/scrutiny|d' /etc/services.d/collector-once/run; \
+    fi
+
 # Uses /bin for compatibility purposes
 # hadolint ignore=DL4005
 RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
@@ -131,4 +137,4 @@ HEALTHCHECK \
     --retries=5 \
     --start-period=30s \
     --timeout=25s \
-    CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1
+    CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1
\ No newline at end of file

From affc41083e41863b25aedac7b5394b495efd2758 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 18 Jul 2026 10:09:30 +0200
Subject: [PATCH 2/6] scrutiny-fa: remove unsupported s6 startup wait

---
 scrutiny_fa/Dockerfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile
index c607c3573b..e6cd15a0d2 100644
--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -35,6 +35,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 COPY rootfs/ /
 RUN find . -type f \( -name "*.sh" -o -name "run" -o -name "finish" \) -print -exec chmod +x {} \;
 
+# The Home Assistant entrypoint starts services directly instead of running s6.
+# Scrutiny's collector already waits for the API health endpoint, so remove its s6-only wait.
+RUN if grep -q 's6-svwait -u /run/service/scrutiny' /etc/services.d/collector-once/run; then \
+        sed -i '\|s6-svwait -u /run/service/scrutiny|d' /etc/services.d/collector-once/run; \
+    fi
+
 # Uses /bin for compatibility purposes
 # hadolint ignore=DL4005
 RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
@@ -133,4 +139,4 @@ HEALTHCHECK \
     --retries=5 \
     --start-period=30s \
     --timeout=25s \
-    CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1
+    CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1
\ No newline at end of file

From 96fb24a1fe0ea6e965c11f8380474ce204d5e61b Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 18 Jul 2026 10:09:50 +0200
Subject: [PATCH 3/6] scrutiny: bump add-on version

---
 scrutiny/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scrutiny/config.yaml b/scrutiny/config.yaml
index ee8a842621..809fca7126 100644
--- a/scrutiny/config.yaml
+++ b/scrutiny/config.yaml
@@ -113,4 +113,4 @@ schema:
 slug: scrutiny
 udev: true
 url: https://github.com/Starosdev/scrutiny
-version: "v1.67.0"
+version: "v1.67.0-2"
\ No newline at end of file

From e9fbacc3f88da4c6395602e26486f5dcc25b7400 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 18 Jul 2026 10:10:00 +0200
Subject: [PATCH 4/6] scrutiny-fa: bump add-on version

---
 scrutiny_fa/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scrutiny_fa/config.yaml b/scrutiny_fa/config.yaml
index 0ea8dd342a..4ad8794017 100644
--- a/scrutiny_fa/config.yaml
+++ b/scrutiny_fa/config.yaml
@@ -45,4 +45,4 @@ schema:
 slug: scrutiny_fa
 udev: true
 url: https://github.com/Starosdev/scrutiny
-version: "v1.67.0"
+version: "v1.67.0-2"
\ No newline at end of file

From f425c6fe6170a956d599daddc26e4c25ab8e6d25 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 18 Jul 2026 10:10:42 +0200
Subject: [PATCH 5/6] scrutiny: document startup fix

---
 scrutiny/CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scrutiny/CHANGELOG.md b/scrutiny/CHANGELOG.md
index 402c8cb298..20b134b6e4 100644
--- a/scrutiny/CHANGELOG.md
+++ b/scrutiny/CHANGELOG.md
@@ -1,4 +1,7 @@
  
+## v1.67.0-2 (2026-07-18)
+- Fix startup with the Home Assistant entrypoint by removing the upstream collector's unsupported s6 service wait. The collector still waits for the Scrutiny API health endpoint before running.
+
 ## v1.67.0 (2026-07-18)
 - Update to latest version from Starosdev/scrutiny (changelog : https://github.com/Starosdev/scrutiny/releases)
  
@@ -178,4 +181,4 @@
 ## 27b923b5-ls11
 
 - Enables PUID/PGID options
-- Daily update of values
+- Daily update of values
\ No newline at end of file

From 8a3710a9d2ca2f68965a5e682efdf75979265a65 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 18 Jul 2026 10:11:24 +0200
Subject: [PATCH 6/6] scrutiny-fa: document startup fix

---
 scrutiny_fa/CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scrutiny_fa/CHANGELOG.md b/scrutiny_fa/CHANGELOG.md
index f388e7aac0..1fcb0a29e0 100644
--- a/scrutiny_fa/CHANGELOG.md
+++ b/scrutiny_fa/CHANGELOG.md
@@ -1,4 +1,7 @@
  
+## v1.67.0-2 (2026-07-18)
+- Fix startup with the Home Assistant entrypoint by removing the upstream collector's unsupported s6 service wait. The collector still waits for the Scrutiny API health endpoint before running.
+
 ## v1.67.0 (2026-07-18)
 - Update to latest version from Starosdev/scrutiny (changelog : https://github.com/Starosdev/scrutiny/releases)
  
@@ -183,4 +186,4 @@
 ## 27b923b5-ls11
 
 - Enables PUID/PGID options
-- Daily update of values
+- Daily update of values
\ No newline at end of file