From 4e6634208509f5c67b4d5ad449db696b8e4b6c3d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 30 Jan 2020 16:44:49 +0000
Subject:  Do not attempt to unmount /run

---
 src/misc/s6-linux-init-umountall.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/misc')

diff --git a/src/misc/s6-linux-init-umountall.c b/src/misc/s6-linux-init-umountall.c
index 49c9f97..cb5f7d5 100644
--- a/src/misc/s6-linux-init-umountall.c
+++ b/src/misc/s6-linux-init-umountall.c
@@ -10,6 +10,8 @@
 #include <skalibs/stralloc.h>
 #include <skalibs/skamisc.h>
 
+#include <s6-linux-init/config.h>
+
 #define MAXLINES 99
 
 #define EXCLUDEN 3
@@ -39,7 +41,9 @@ int main (int argc, char const *const *argv)
         got[i]++ ;
         break ;
       }
-    if (i < EXCLUDEN && got[i] == 1) continue ;
+    if ((i < EXCLUDEN && got[i] == 1)
+     || !strcmp(p->mnt_dir, S6_LINUX_INIT_TMPFS))
+      continue ;
     if (line >= MAXLINES)
       strerr_dief1x(100, "too many mount points") ;
     mountpoints[line++] = sa.len ;
-- 
cgit v1.2.3