mrrl-containers

commit b33379604e502cc7b6c34465ae3358c815a69aaa
parent 8f5b1e4a7fec8f2b9dec6bc5d2aad7fd2246a231
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Mon, 21 Feb 2022 02:40:40 +0000

Bind mount the container-user-init to generic containers.
Diffstat:
M
zsh-functions/confz_containers_init
 | 
2
+-
M
zsh-functions/confz_site_containers_init
 | 
2
++

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -238,7 +238,7 @@ confz_container_service_generic_check() {
 	local -a fstab mnt_dirs
 	checkvars containers_dir svscan_dir image_name user
 	defvar fstab_extra ''
-	defvar mnt_dirs_extra 'ns'
+	defvar mnt_dirs_extra ''
 	defvar container_name "$vars[image_name]"
 	container=$vars[container_name]
 
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -14,6 +14,8 @@ confz_site_containers_user_check() {
 	for container in alpine-{games,browsers,ssh} void-musl-gajim; do
 		require container_service_generic \
 			image_name=$container \
+			mnt_dirs_extra=init \
+			fstab_extra=/home/$vars[user]/bzr/container-user-init$'\t'$bindroot/mnt/init$bind \
 			:containers_dir :svscan_dir :user
 	done