commit 91167922476b9dca214b5a6c1e53234d07e7fcba parent 65b3720ba91641b7815444957172c2059aae6886 Author: Jan Pobříslo <ccx@te2000.cz> Date: Thu, 23 Jun 2022 00:18:47 +0200 use logical variable for image root Diffstat:
| M | zsh-functions/confz_containers_init | | | 12 | +++++++----- |
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init @@ -934,13 +934,12 @@ confz_container_nix_image_from_release_check() { } confz_container_nix_unpacked_check() { - checkvars containers_dir image_name filename - local root=$vars[containers_dir]/systems/$vars[image_name] + checkvars containers_dir root user filename local download_dir=$vars[containers_dir]/download-cache do_command=( - s6-setuidgid container-$vars[image_name] - tar -xpC "$root" -f "$download_dir/$vars[filename]" + s6-setuidgid $vars[user] + tar -xpC "$vars[root]" -f "$download_dir/$vars[filename]" ) [[ -f $root/install ]] @@ -953,12 +952,15 @@ confz_container_nix_image_check() { 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 :image_name :filename + require container_nix_unpacked :containers_dir :filename :root \ + user=container-$vars[image_name] } confz_container_nix_packages_installed_check() {