=== modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2022-06-22 22:18:47 +0000 +++ new/zsh-functions/confz_containers_init 2022-06-22 22:12:28 +0000 @@ -934,12 +934,13 @@ } confz_container_nix_unpacked_check() { - checkvars containers_dir root user filename + checkvars containers_dir image_name filename + local root=$vars[containers_dir]/systems/$vars[image_name] local download_dir=$vars[containers_dir]/download-cache do_command=( - s6-setuidgid $vars[user] - tar -xpC "$vars[root]" -f "$download_dir/$vars[filename]" + s6-setuidgid container-$vars[image_name] + tar -xpC "$root" -f "$download_dir/$vars[filename]" ) [[ -f $root/install ]] @@ -952,15 +953,12 @@ defvar hostname $vars[image_name] defvar locale C.UTF-8 - unify root $vars[containers_dir]/systems/$vars[image_name] - require container_download_and_verify :containers_dir \ :checksum :checksum_algo %filename :url require container_sysroot_user %uid %gid :containers_dir :image_name require container_generic_layout :uid :gid :root - require container_nix_unpacked :containers_dir :filename :root \ - user=container-$vars[image_name] + require container_nix_unpacked :containers_dir :image_name :filename } confz_container_nix_packages_installed_check() {