mrrl-containers

commit c56a4458bbbe71da05436ac795ee9369a23c7bda
parent 21941417791a87b84fa06452402dc9e1fe9c6a23
Author: ccx <ccx@te2000.cz>
Date:   Mon, 25 Mar 2024 00:00:53 +0000

More inbox removals

Diffstat:
M
sbin/container_sysroot_run
 | 
2
+-
M
service_scripts/alsa/finish
 | 
6
+-----
M
service_scripts/xorg/finish
 | 
4
----
M
zsh-functions/confz_containers_init
 | 
4
----

4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/sbin/container_sysroot_run b/sbin/container_sysroot_run
@@ -8,7 +8,7 @@ backtick -in CONTAINER_USER_HOME { homeof $CONTAINER_USER }
 multisubstitute {
 	importas -i -u CONTAINER_USER_HOME CONTAINER_USER_HOME
 	define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.sysroot
-	define -s tmpfs_dirs "home run tmp inbox run/inbox tmp/.X11-unix"
+	define -s tmpfs_dirs "home run tmp run/inbox tmp/.X11-unix"
 }
 
 getpid NS_PID
diff --git a/service_scripts/alsa/finish b/service_scripts/alsa/finish
@@ -6,11 +6,7 @@ multisubstitute {
 	importas -i CONTAINER_NAME CONTAINER_NAME
 	importas -i CONTAINER_USER CONTAINER_USER
 }
-multisubstitute {
-	define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
-#	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
-}
-foreground { umount --recursive data/root }
+define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
 foreground { rm -rf ${CONTAINER_TMPFS} }
 foreground { sleep .1 }  # let logger flush buffers
 s6-svc -a log  # rotate the log
diff --git a/service_scripts/xorg/finish b/service_scripts/xorg/finish
@@ -7,10 +7,6 @@ multisubstitute {
 	importas -i CONTAINER_USER CONTAINER_USER
 }
 define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
-#foreground { umount ${CONTAINER_TMPFS}/inbox }
-#foreground { umount ${CONTAINER_TMPFS}/run }
-#foreground { umount ${CONTAINER_TMPFS}/tmp }
-#foreground { umount --recursive data/root/ }
 foreground {
 	if { test -f ${CONTAINER_TMPFS}/run/X/log }
 	mv ${CONTAINER_TMPFS}/run/X/log data/lastlog
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -280,7 +280,6 @@ confz_container_service_sysroot_check() {
 		# /run/containers/$container.sysroot/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$container.sysroot/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
 		# /run/containers/$container.sysroot/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.sysroot/inbox$'\t'$container_user_dir/root/run/inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		"${(f@)vars[fstab_extra]}"
 	)
 
@@ -614,9 +613,6 @@ confz_container_generic_layout_check() {
 	require fs_d filename="$vars[root]/mnt/ns"
 	require fs_m filename="$vars[root]/mnt/ns" mode=0755
 	require fs_o filename="$vars[root]/mnt/ns" owner=$vars[uid]:$vars[gid]
-	require fs_d filename="$vars[root]/mnt/inbox"
-	require fs_m filename="$vars[root]/mnt/inbox" mode=0755
-	require fs_o filename="$vars[root]/mnt/inbox" owner=$vars[uid]:$vars[gid]
 
 	require fs_d filename="$vars[root]/run"
 	require fs_m filename="$vars[root]/run" mode=0755