Merge pull request #2039 from alexbelgium/revert-2038-codex/fix-s6-svwait-error-in-script

Revert "scrutiny: remove s6 dependency in finish script"

scrutiny/CHANGELOG.md

@@ -1,6 +1,3 @@
-## v0.8.1-12 (16-08-2025)
-- Replace s6-based shutdown with standard command to avoid s6-svwait error
-
 ## v0.8.1-11 (15-08-2025)
 - Minor bugs fixed
 ## v0.8.1-10 (13-08-2025)

scrutiny/config.json

@@ -120,5 +120,5 @@
   "slug": "scrutiny",
   "udev": true,
   "url": "https://github.com/AnalogJ/scrutiny",
-  "version": "v0.8.1-12"
+  "version": "v0.8.1-11"
 }

scrutiny/rootfs/etc/services.d/nginx/finish

@@ -1,9 +1,8 @@
-#!/usr/bin/with-contenv bashio
-# shellcheck shell=bash
+#!/usr/bin/execlineb -S0
 # ==============================================================================
-# Stop the container when Nginx fails
+# Take down the S6 supervision tree when Nginx fails
 # ==============================================================================
-if [[ "$1" -ne 0 && "$1" -ne 256 ]]; then
-    bashio::log.error "Nginx exited with code $1"
-    kill -15 1
-fi
+if { s6-test ${1} -ne 0 }
+if { s6-test ${1} -ne 256 }
+
+s6-svscanctl -t /var/run/s6/services