=== modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2021-01-15 18:16:30 +0000 +++ new/zsh-functions/confz_containers_init 2021-01-15 17:43:24 +0000 @@ -132,7 +132,7 @@ $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/.inbox$'\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' "${(f@)vars[fstab_extra]}" ) === modified file 'zsh-functions/confz_site_containers_init' --- old/zsh-functions/confz_site_containers_init 2021-01-15 18:16:30 +0000 +++ new/zsh-functions/confz_site_containers_init 2021-01-15 17:25:39 +0000 @@ -2,7 +2,7 @@ confz_site_containers_user_check() { checkvars containers_dir svscan_dir user - local display container bind bind_dir bindroot + local display container bind bind_dir container_user_dir local -a fstab bind=$'\tnone\tbind,nosuid,nodev\t0 0' @@ -18,7 +18,7 @@ done # bind-mounts for alpine-dev - bindroot=$vars[containers_dir]/user/$vars[user]/alpine-dev/root + container_user_dir=$vars[containers_dir]/user/$vars[user]/alpine-dev 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_check() { - defvar containers_dir /mnt/volumes/containers - defvar svscan_dir /run/service - require site_containers_user user=ccx :containers_dir :svscan_dir + require site_containers_user user=ccx \ + containers_dir=/mnt/volumes/containers \ + svscan_dir=/run/service }