mrrl-containers

commit 1d5e18b13055e17c1997b96e8d3f8512772dbbb7
parent 06e854e114b61d09a04211b47cf47644bf2a5e43
Author: ccx <ccx@te2000.cz>
Date:   Sun, 24 Mar 2024 21:39:28 +0000

Make container_type an argument

Diffstat:
M
zsh-functions/confz_site_containers_init
 | 
12
+++++-------

1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -15,6 +15,7 @@ confz_site_containers_usersvc_simple_check() {
 	checkvars containers_dir svscan_dir user uid gid image_name
 	defvar container_name "$vars[image_name]"
 	defvar mount_ro init
+	defvar container_type generic
 
 	local userdir bindroot flags mtp
 	local -a fstab mnt_dirs_extra
@@ -41,7 +42,7 @@ confz_site_containers_usersvc_simple_check() {
 		unify fstab_extra ${(F)fstab}
 	fi
 
-	require container_service_generic \
+	require container_service_$vars[container_type] \
 		:image_name :container_name :containers_dir :svscan_dir :user \
 		\?mnt_dirs_extra \?fstab_extra
 
@@ -104,15 +105,12 @@ confz_site_containers_user_check() {
 		neonmodem alpine-go
 		simplex alpine-haskell
 		spark $'alpine-dev-spark\0mount_rw=ccx-bzr ccx-git'
-		sndiod alpine-sndio
-		mpd $'void-mpd\0mount_ro=audio'
+		sndiod $'alpine-sndio\0container_type=alsa'
+		mpd $'void-mpd\0mount_ro=init audio'
 		alpine-recombee $'alpine-recombee\0mount_rw=ccx-git-recombee'
 	)
-	local -A container_type=(
-		sndiod container_service_alsa
-	)
 	for container param in ${(kv)container_img}; do
-		require ${container_type[$container]:-site_containers_usersvc_simple} \
+		require site_containers_usersvc_simple \
 			:containers_dir :svscan_dir :user uid=$uid gid=$gid \
 			container_name=$container image_name=${(0)param}
 	done