mrrl-containers

commit a8bba2bd4a388d24d10aff7d97b0a66e8cf6fb54
parent 33de51edb557a3e4adf0578d08df514bddc763cb
Author: ccx <ccx@te2000.cz>
Date:   Mon, 18 Mar 2024 12:34:28 +0000

back to run/shm

Diffstat:
M
sbin/ns_run
 | 
5
+----
M
service_scripts/xorg/finish
 | 
2
+-
M
service_scripts/xorg/run
 | 
3
++-

3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/sbin/ns_run b/sbin/ns_run
@@ -96,16 +96,13 @@ if { s6-ln -sf /proc/self/fd/0 dev/stdin }
 if { s6-ln -sf /proc/self/fd/1 dev/stout }
 if { s6-ln -sf /proc/self/fd/2 dev/stderr }
 
-foreground { ls -lhA --full-time }
-foreground { ls -lhA --full-time ./run }
-
 # shm, pts and mqueue are provided below
 # also have some convenience dirs in place for optionally bind-mounting them
 if {
 	mkdir
 
 #	dev/shm
-#	run/shm
+	run/shm
 
 	dev/pts
 	dev/mqueue
diff --git a/service_scripts/xorg/finish b/service_scripts/xorg/finish
@@ -12,7 +12,7 @@ multisubstitute {
 foreground { umount ${CONTAINER_TMPFS}/inbox }
 foreground { umount ${CONTAINER_TMPFS}/run }
 foreground { umount ${CONTAINER_TMPFS}/tmp }
-foreground { umount --recursive data/root/ }
+#foreground { umount --recursive data/root/ }
 foreground {
 	if { test -f ${CONTAINER_TMPFS}/run/uncaught-logs/current }
 	mv ${CONTAINER_TMPFS}/run/uncaught-logs/current data/lastlog
diff --git a/service_scripts/xorg/run b/service_scripts/xorg/run
@@ -42,7 +42,7 @@ if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}${XDG_RUNTIME_D
 # if { redirfd -w 1 ${CONTAINER_TMPFS}/run/resolv.conf printf "nameserver 127.0.0.1\n" }
 # if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}/run/resolv.conf }
 
-if { mount -a -T data/fstab }
+backtick -i FSTAB_FILE { realpath data/fstab }
 
 # Put UID/GID/GIDLIST into environment for use by s6-applyuidgid below
 s6-envuidgid ${CONTAINER_USER}
@@ -51,6 +51,7 @@ env
   HOST=${CONTAINER_NAME}
   #RUN_CHOWN=${UID}:${GID}
   NS_EXTRA="
+	if { mount -a -T ${FSTAB_FILE} }
 	if { mount -o bind,ro /etc/passwd ./etc/passwd }
 	if { mount -o bind,ro /etc/group ./etc/group }
 	if { mount -o bind /dev/input ./dev/input }