Merge remote-tracking branch 'pcc/s6'

2026-05-27 13:14:33 +01:00
parent f6978f9770 01ded6eb25
commit c212824209
2 changed files with 48 additions and 5 deletions
@@ -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;
@@ -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
+