mrrl-containers

commit c4dd92235c2545afeaad59e3e313b920355c9386
parent 88b56cd704eb156c68bd2a0d10b09b3aef74618c
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Fri, 15 Jan 2021 18:03:54 +0100

Conditional passing of optional variables.
Diffstat:
M
zsh-functions/confz_containers_init
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -82,13 +82,13 @@ confz_container_service_check() {
 
 confz_container_service_preset_check() {
 	local preset_dir=/usr/local/bzr/containers/service_scripts
-	checkvars svc_dir preset
+	checkvars svc_dir preset root_link fstab
 	[[ -x $preset_dir/$vars[preset]/run ]] || die "not an executable file: $preset_dir/$vars[preset]/run"
 	[[ -x $preset_dir/$vars[preset]/finish ]] || die "not an executable file: $preset_dir/$vars[preset]/finish"
 	require container_service \
 		run_link=$preset_dir/$vars[preset]/run \
 		finish_link=$preset_dir/$vars[preset]/finish \
-		:svc_dir :root_link :fstab :down :control_user :control_group
+		:svc_dir :root_link :fstab \?down \?control_user \?control_group
 }
 
 confz_container_service_generic_check() {
@@ -140,7 +140,7 @@ confz_container_service_generic_check() {
 	require container_service_preset preset=generic \
 		svc_dir=$svc_dir control_user=$uid control_group=$gid \
 		root_link=$container_user_dir/root \
-		fstab=${(F)fstab} :down
+		fstab=${(F)fstab} \?down
 	require fs_d filename=$svc_dir/env
 	require fs_c filename=$svc_dir/env/CONTAINER_USER \
 		content_call="printf '%s\n' "${(q)vars[user]}
@@ -190,7 +190,7 @@ confz_container_service_xsession_check() {
 	require container_service_preset preset=xsession \
 		svc_dir=$svc_dir control_user=$uid control_group=$gid \
 		root_link=$container_user_dir/root \
-		fstab=${(F)fstab} :down
+		fstab=${(F)fstab} \?down
 	require fs_d filename=$svc_dir/env
 	require fs_c filename=$svc_dir/env/CONTAINER_USER \
 		content_call="printf '%s\n' "${(q)vars[user]}