mrrl-containers

commit beca676f4b0de67d4a0aed026fbd9f719dc1e6f0
parent 877ec64f3fa028befc6aa8da372219a179464f67
Author: ccx <ccx@te2000.cz>
Date:   Mon, 18 Mar 2024 15:57:39 +0000

Create run/shm in extra commands rather than ns_run_mounts

Diffstat:
M
sbin/ns_run_mounts
 | 
4
----
M
service_scripts/xorg/run
 | 
6
++++++

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sbin/ns_run_mounts b/sbin/ns_run_mounts
@@ -5,7 +5,3 @@ if { mount -t proc proc ${1}/proc }
 
 # /dev
 if { ns_run_mount_dev ${1}/dev }
-
-# /dev/shm -> /run/shm
-if { mkdir ${1}/run/shm }
-if { chmod 1777 ${1}/run/shm }
diff --git a/service_scripts/xorg/run b/service_scripts/xorg/run
@@ -51,9 +51,15 @@ emptyenv -c
 unshare -m -u -i  # new mount, UTS and IPC namespaces
 ns_run_unshared data/root {
 	# pre pivot-root commands
+	# /dev/shm -> /run/shm
+	if { mkdir ${1}/run/shm }
+	if { chmod 1777 ${1}/run/shm }
+
 	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 }
+
 	if { cp -a /dev/tty${vtN} ./dev/tty${vtN} }
 	if { chmod 660 ./dev/tty${vtN} }
 	if { chown root:xorg ./dev/tty${vtN} }