liminix

commit 01ded6eb25ec75e4c5599755764e086816c50a25
parent 8e36690ae2ad7439188bc2b2319da48e6d723faf
Author: Peter Collingbourne <peter@pcc.me.uk>
Date:   Sun, 24 May 2026 00:30:10 -0700

Patch s6-linux-init to fix running from non-root filesystem

With #26 the s6 binaries will run from a non-root filesystem. This
exposed a bug in s6-linux-init which is now fixed upstream. Apply the fix.

Diffstat:
M
overlay.nix
 | 
15
++++++++++-----
A
pkgs/s6-linux-init/0001-Prepare-for-1.2.0.2-attempt-ro-remount-if-umount-fai.patch
 | 
38
++++++++++++++++++++++++++++++++++++++

2 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/overlay.nix b/overlay.nix
@@ -381,11 +381,16 @@ extraPkgs
     r.override { openssl = null; };
 
   inherit s6;
-  s6-linux-init = prev.s6-linux-init.override {
-    skawarePackages = prev.skawarePackages // {
-      inherit s6;
-    };
-  };
+  s6-linux-init =
+    (prev.s6-linux-init.override {
+      skawarePackages = prev.skawarePackages // {
+        inherit s6;
+      };
+    }).overrideAttrs
+      (o: {
+        patches = [ ./pkgs/s6-linux-init/0001-Prepare-for-1.2.0.2-attempt-ro-remount-if-umount-fai.patch ];
+      });
+
   s6-rc = prev.s6-rc.override {
     skawarePackages = prev.skawarePackages // {
       inherit s6;
diff --git a/pkgs/s6-linux-init/0001-Prepare-for-1.2.0.2-attempt-ro-remount-if-umount-fai.patch b/pkgs/s6-linux-init/0001-Prepare-for-1.2.0.2-attempt-ro-remount-if-umount-fai.patch
@@ -0,0 +1,38 @@
+From 7329cd1b23ba51c9ea8f526dbd491b8cd9d5b822 Mon Sep 17 00:00:00 2001
+From: Laurent Bercot <ska-skaware@skarnet.org>
+Date: Sat, 23 May 2026 12:30:44 +0000
+Subject: [PATCH]  Prepare for 1.2.0.2; attempt ro remount if umount fails
+
+---
+ src/misc/s6-linux-init-umountall.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/misc/s6-linux-init-umountall.c b/src/misc/s6-linux-init-umountall.c
+index d4320ad..e7a2f53 100644
+--- a/src/misc/s6-linux-init-umountall.c
++++ b/src/misc/s6-linux-init-umountall.c
+@@ -55,8 +55,19 @@ int main (int argc, char const *const *argv)
+   while (line--)
+     if (umount(sa.s + mountpoints[line]) == -1)
+     {
+-      e++ ;
+-      strerr_warnwu2sys("umount ", sa.s + mountpoints[line]) ;
++      if (errno == EBUSY)
++      {
++        if (mount(0, sa.s + mountpoints[line], 0, MS_REMOUNT | MS_RDONLY, 0) == -1)
++        {
++          e++ ;
++          strerr_warnwusys("read-only remount ", sa.s + mountpoints[line]) ;
++        }
++      }
++      else
++      {
++        e++ ;
++        strerr_warnwu2sys("umount ", sa.s + mountpoints[line]) ;
++      }
+     }
+   stralloc_free(&sa) ;
+   return e ;
+-- 
+2.54.0
+