From 18d618dcfdacf9f24cfdc1fd76b8c8ae28daf130 Mon Sep 17 00:00:00 2001 From: amannocci <10237040+amannocci@users.noreply.github.com> Date: Sun, 12 Jul 2026 23:42:13 +0000 Subject: [PATCH 1/2] chore: bump s6 ecosystem package versions Automated version bump from Dependabot++ --- src/usr/src/install-ignity.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/usr/src/install-ignity.sh b/src/usr/src/install-ignity.sh index bdfdc9e..0011515 100644 --- a/src/usr/src/install-ignity.sh +++ b/src/usr/src/install-ignity.sh @@ -16,10 +16,10 @@ readonly SKALIBS_URL="https://github.com/skarnet/skalibs.git" readonly EXECLINE_URL="https://github.com/skarnet/execline.git" readonly S6_URL="https://github.com/skarnet/s6.git" readonly S6_PORTABLE_UTILS_URL="https://github.com/skarnet/s6-portable-utils.git" -readonly SKALIBS_VERSION="2.14.5.1" -readonly EXECLINE_VERSION="2.9.8.1" -readonly S6_VERSION="2.14.0.1" -readonly S6_PORTABLE_UTILS_VERSION="2.3.1.1" +readonly SKALIBS_VERSION="2.15.0.0" +readonly EXECLINE_VERSION="2.9.9.1" +readonly S6_VERSION="2.15.0.0" +readonly S6_PORTABLE_UTILS_VERSION="2.3.1.2" BUILD_DEPENDENCIES="ca-certificates build-essential git" # Fine tuning From fd2f0843d9fd685fb636938b455bf989d5846b90 Mon Sep 17 00:00:00 2001 From: amannocci Date: Wed, 15 Jul 2026 12:15:26 +0200 Subject: [PATCH 2/2] fix: pin s6-setsid ctty to fd 0 for s6 2.15.0.0 compat s6-setsid's -g flag now defaults to opening /dev/tty instead of using fd 0, and dies unconditionally (bypassing -q) if that open fails, breaking CMD execution in containers without a controlling terminal. --- src/etc/s6/boot/stage2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/s6/boot/stage2 b/src/etc/s6/boot/stage2 index 2674001..62b8139 100755 --- a/src/etc/s6/boot/stage2 +++ b/src/etc/s6/boot/stage2 @@ -38,7 +38,7 @@ foreground { # The init is complete, If the user has a given CMD, run it now, then kill everything when it exits. if -t { eltest $# -ne 0 } - foreground { with-env s6-setsid -gq -- $@ } + foreground { with-env s6-setsid -gq -d 0 -- $@ } importas -u ? ? foreground { s6-echo -- "[supervisor/cmd] ${1} exited ${?}" }