mrrl-containers

commit 62efa5671d77be5a64d5c7ccf4a909ad3a8d4ac7
parent 54c25abe602eba7b6acf89b8aba60b9df3b45026
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 16 Dec 2021 14:52:24 +0000

Don't erase the run directories in container_sysroot_run as they may be still mounted
Diffstat:
M
sbin/container_sysroot_run
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sbin/container_sysroot_run b/sbin/container_sysroot_run
@@ -22,7 +22,11 @@ foreground {
 
 if { touch ${CONTAINER_TMPFS}.lockfile }
 s6-setlock -n ${CONTAINER_TMPFS}.lockfile
-if { rm -rf ${CONTAINER_TMPFS} }
+
+# This is non-POSIX but even busybox has these flags
+if { find ${CONTAINER_TMPFS} -depth -mindepth 2 -delete }
+#if { rm -rf ${CONTAINER_TMPFS} }
+
 if { mkdir -p ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { chmod 1770 ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { chown root:${CONTAINER_USER} ${CONTAINER_TMPFS}/${tmpfs_dirs} }