mrrl-containers

commit 50cfb605a20bba2faef3639efc7e1eb1111b4863
parent e3d31510b2839eeac9a956615f13523d6b3a0049
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Tue, 25 Jul 2023 23:44:45 +0200

Migrate .inbox to /mnt/inbox; use eltest in favour of s6-test
Diffstat:
M
sbin/ns_run
 | 
4
++--
M
service_scripts/alsa/run
 | 
2
+-
M
service_scripts/generic/run
 | 
2
+-
M
zsh-functions/confz_containers_init
 | 
12
++++--------

4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/sbin/ns_run b/sbin/ns_run
@@ -133,14 +133,14 @@ if { s6-mount -n -o bind,ro $NS_BIN ${NS_TMPFS}/bin }
 
 # container-specific setup provided in environment
 if {
-	if -t { s6-test -v NS_EXTRA }
+	if -t { eltest -v NS_EXTRA }
 	importas -i NS_EXTRA NS_EXTRA
 	execlineb -c $NS_EXTRA
 }
 unexport NS_EXTRA
 
 if {
-	if -t { s6-test -v NS_FSTAB }
+	if -t { eltest -v NS_FSTAB }
 	importas -i NS_FSTAB NS_FSTAB
 	mount -a --fstab $NS_FSTAB
 }
diff --git a/service_scripts/alsa/run b/service_scripts/alsa/run
@@ -35,7 +35,7 @@ s6-envuidgid ${CONTAINER_USER}
 
 # Run user's setup script (optional)
 if {
-	ifelse { s6-test -x ${CONTAINER_USER_HOME}/container-setup } {
+	ifelse { eltest -x ${CONTAINER_USER_HOME}/container-setup } {
 		env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
 		s6-applyuidgid -U
 		${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
diff --git a/service_scripts/generic/run b/service_scripts/generic/run
@@ -35,7 +35,7 @@ s6-envuidgid ${CONTAINER_USER}
 
 # Run user's setup script (optional)
 if {
-	ifelse { s6-test -x ${CONTAINER_USER_HOME}/container-setup } {
+	ifelse { eltest -x ${CONTAINER_USER_HOME}/container-setup } {
 		env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
 		s6-applyuidgid -U
 		${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -268,7 +268,7 @@ 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/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
+		/run/containers/$container.sysroot/inbox$'\t'$container_user_dir/root/mnt/inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		"${(f@)vars[fstab_extra]}"
 	)
 
@@ -327,7 +327,6 @@ confz_container_service_generic_check() {
 		$container_user_dir/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$container.$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$container.$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		/run/containers/$container.$vars[user]/mnt$'\t'$container_user_dir/root/mnt$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		"${(f@)vars[fstab_extra]}"
 	)
@@ -389,7 +388,6 @@ confz_container_service_alsa_check() {
 		$container_user_dir/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$container.$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$container.$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		"${(f@)vars[fstab_extra]}"
 	)
 
@@ -443,7 +441,6 @@ confz_container_service_xsession_check() {
 		/run/containers/$container.$vars[user]/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$container.$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$container.$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$container.$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		/run/containers/$container.$vars[user]/mnt$'\t'$container_user_dir/root/mnt$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		/run/container-logs$'\t'$container_user_dir/root/mnt/container-logs$'\tnone\tbind,ro,nosuid,nodev\t0 0'
 		"${(f@)vars[fstab_extra]}"
@@ -531,10 +528,6 @@ confz_container_generic_layout_check() {
 	require fs_m filename="$vars[root]" mode=0755
 	require fs_o filename="$vars[root]" owner=$vars[uid]:$vars[gid]
 
-	require fs_d filename="$vars[root]/.inbox"
-	require fs_m filename="$vars[root]/.inbox" mode=0755
-	require fs_o filename="$vars[root]/.inbox" owner=$vars[uid]:$vars[gid]
-
 	require fs_d filename="$vars[root]/etc"
 	require fs_m filename="$vars[root]/etc" mode=0755
 	require fs_o filename="$vars[root]/etc" owner=$vars[uid]:$vars[gid]
@@ -567,6 +560,9 @@ 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