=== modified file 'zsh-functions/confz_site_containers_init' --- old/zsh-functions/confz_site_containers_init 2022-06-25 19:40:11 +0000 +++ new/zsh-functions/confz_site_containers_init 2022-06-25 19:30:38 +0000 @@ -2,15 +2,15 @@ confz_site_containers_usersvc_simple_check() { checkvars containers_dir svscan_dir user uid gid image_name - defvar container_name "$vars[image_name]" + local display container bind bind_dir bindroot uid gid - local userdir=$vars[containers_dir]/user/$vars[user] - local bindroot=$userdir/$vars[container_name]/root + bindroot=$vars[containers_dir]/user/$vars[user]/$container/root require container_service_generic \ - :image_name :container_name :containers_dir :svscan_dir :user + :image_name \?container_name \ mnt_dirs_extra=init \ fstab_extra=/home/$vars[user]/bzr/container-user-init$'\t'$bindroot/mnt/init$'\tnone\tbind,ro,nosuid,nodev\t0 0' \ - local chome=$userdir/$vars[container_name]/home/$vars[user] + :containers_dir :svscan_dir :user + local chome=$vars[containers_dir]/user/$vars[user]/$container/home/$vars[user] if ! [[ -d $chome/run ]]; then require fs_l filename=$chome/run destination=/mnt/init require fs_o filename=$chome/run owner=$uid:$gid