mrrl-containers

commit 5ac01074e8ef3b639a6637a9bdcfd62c3c9ea157
parent 23ceb1a23b8ed0b7c9142a09cd7edf713d234c1a
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Fri, 15 Jan 2021 19:16:30 +0100

move inbox, fix alpine-dev mounts
Diffstat:
M
zsh-functions/confz_containers_init
 | 
2
+-
M
zsh-functions/confz_site_containers_init
 | 
10
+++++-----

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -132,7 +132,7 @@ confz_container_service_generic_check() {
 		$container_user_dir/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$vars[image_name].$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0'
 		/run/containers/$vars[image_name].$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0'
-		/run/containers/$vars[image_name].$vars[user]/inbox$'\t'$container_user_dir/root/run/inbox$'\tnone\tbind,nosuid,nodev\t0 0'
+		/run/containers/$vars[image_name].$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,nosuid,nodev\t0 0'
 		"${(f@)vars[fstab_extra]}"
 	)
 
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -2,7 +2,7 @@
 
 confz_site_containers_user_check() {
 	checkvars containers_dir svscan_dir user
-	local display container bind bind_dir container_user_dir
+	local display container bind bind_dir bindroot
 	local -a fstab
 	bind=$'\tnone\tbind,nosuid,nodev\t0 0'
 
@@ -18,7 +18,7 @@ confz_site_containers_user_check() {
 	done
 
 	# bind-mounts for alpine-dev
-	container_user_dir=$vars[containers_dir]/user/$vars[user]/alpine-dev
+	bindroot=$vars[containers_dir]/user/$vars[user]/alpine-dev/root
 	fstab=( )
 	for bind_dir in /home/$vars[user]/{bzr,development,git}; do
 		fstab+=( $bind_dir$'\t'$container_user_dir/${bind_dir#/}$bind )
@@ -29,7 +29,7 @@ confz_site_containers_user_check() {
 }
 
 confz_site_containers_check() {
-	require site_containers_user user=ccx \
-		containers_dir=/mnt/volumes/containers \
-		svscan_dir=/run/service
+	defvar containers_dir /mnt/volumes/containers
+	defvar svscan_dir /run/service
+	require site_containers_user user=ccx :containers_dir :svscan_dir
 }