commit 74e5ef5945ee2b9839f881732b6da8761cd3d50a parent 5a7b0f2c8510beaf79f1b047f1a8bb05f39e857e Author: Jan Pobříslo <ccx@te2000.cz> Date: Sat, 25 Jun 2022 21:40:11 +0200 site_containers_usersvc_simple fixes Diffstat:
| M | zsh-functions/confz_site_containers_init | | | 10 | +++++----- |
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init @@ -2,15 +2,15 @@ confz_site_containers_usersvc_simple_check() { checkvars containers_dir svscan_dir user uid gid image_name - local display container bind bind_dir bindroot uid gid + defvar container_name "$vars[image_name]" - bindroot=$vars[containers_dir]/user/$vars[user]/$container/root + local userdir=$vars[containers_dir]/user/$vars[user] + local bindroot=$userdir/$vars[container_name]/root require container_service_generic \ - :image_name \?container_name \ + :image_name :container_name :containers_dir :svscan_dir :user mnt_dirs_extra=init \ fstab_extra=/home/$vars[user]/bzr/container-user-init$'\t'$bindroot/mnt/init$'\tnone\tbind,ro,nosuid,nodev\t0 0' \ - :containers_dir :svscan_dir :user - local chome=$vars[containers_dir]/user/$vars[user]/$container/home/$vars[user] + local chome=$userdir/$vars[container_name]/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