mrrl-containers

commit a45719c7a4b1b67446393f747d0dff71ace33097
parent 82438904fb76bbbd9ff87b179a105e8224bd0910
Author: ccx <ccx@te2000.cz>
Date:   Sun, 19 May 2024 23:11:57 +0000

Require CONTAINER_CAPS env var for generic runscript

Diffstat:
M
service_scripts/generic/run
 | 
2
+-
M
zsh-functions/confz_containers_init
 | 
18
++++++------------

2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/service_scripts/generic/run b/service_scripts/generic/run
@@ -5,7 +5,7 @@ s6-envdir env
 multisubstitute {
 	importas -i -u CONTAINER_NAME CONTAINER_NAME
 	importas -i -u CONTAINER_USER CONTAINER_USER
-	importas -D "" -u CONTAINER_CAPS CONTAINER_CAPS
+	importas -i -u CONTAINER_CAPS CONTAINER_CAPS
 }
 backtick -in CONTAINER_USER_HOME { homeof $CONTAINER_USER }
 backtick -D "true" PREPARE_CHROOT { if { test -x data/prepare_chroot } realpath data/prepare_chroot }
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -354,6 +354,7 @@ confz_container_service_ephemeral_check() {
 	local uid gid container_user_dir svc_dir log_dir container
 	local -a fstab mnt_dirs
 	checkvars containers_dir svscan_dir image_name user
+	defvar linux_caps ''
 	defvar fstab_extra ''
 	defvar mnt_dirs_extra ''
 	defvar container_name "$vars[image_name]"
@@ -436,18 +437,15 @@ confz_container_service_ephemeral_check() {
 		content=$container
 	require fs_contentnl filename=$svc_dir/env/CONTAINER_MNT_DIRS \
 		content="$mnt_dirs"
-	if (($+vars[linux_caps])); then
-		require fs_contentnl filename=$svc_dir/env/CONTAINER_CAPS \
-			content=$vars[linux_caps]
-	else
-		require fs_r filename=$svc_dir/env/CONTAINER_CAPS
-	fi
+	require fs_contentnl filename=$svc_dir/env/CONTAINER_CAPS \
+		content=$vars[linux_caps]
 }
 
 confz_container_service_generic_check() {
 	local uid gid container_user_dir svc_dir log_dir container
 	local -a fstab mnt_dirs
 	checkvars containers_dir svscan_dir image_name user
+	defvar linux_caps ''
 	defvar fstab_extra ''
 	defvar mnt_dirs_extra ''
 	defvar container_name "$vars[image_name]"
@@ -537,12 +535,8 @@ confz_container_service_generic_check() {
 		content=$container
 	require fs_contentnl filename=$svc_dir/env/CONTAINER_MNT_DIRS \
 		content="$mnt_dirs"
-	if (($+vars[linux_caps])); then
-		require fs_contentnl filename=$svc_dir/env/CONTAINER_CAPS \
-			content=$vars[linux_caps]
-	else
-		require fs_r filename=$svc_dir/env/CONTAINER_CAPS
-	fi
+	require fs_contentnl filename=$svc_dir/env/CONTAINER_CAPS \
+		content=$vars[linux_caps]
 }
 
 confz_container_service_alsa_check() {