=== modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2022-06-22 22:40:55 +0000 +++ new/zsh-functions/confz_containers_init 2022-06-22 22:23:36 +0000 @@ -933,24 +933,6 @@ :checksum :checksum_algo \?hostname \?locale } -confz_container_nix_bootstrap_utils_check() { - checkvars user root arch - defvar keys_dir /etc/apk/keys - defvar apk_executable apk - do_command=( - s6-setuidgid $vars[user] - $vars[apk_executable] - --update-cache - --initdb - --arch $vars[arch] - --root $vars[root] - --keys-dir $vars[keys_dir] - --no-scripts - add alpine-keys busybox - ) - [[ -f $vars[root]/bin/sh ]] -} - confz_container_nix_unpacked_check() { checkvars containers_dir root user filename local download_dir=$vars[containers_dir]/download-cache @@ -960,7 +942,7 @@ tar -xpC "$vars[root]" -f "$download_dir/$vars[filename]" ) - [[ -f $vars[root]/${vars[filename]%.tar.*}/install ]] + [[ -f $vars[root]/install ]] } confz_container_nix_image_check() { @@ -971,18 +953,14 @@ defvar locale C.UTF-8 unify root $vars[containers_dir]/systems/$vars[image_name] - unify user container-$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_bootstrap_utils :user :root \ - arch=x86_64 # TODO: infer correct arch - - require container_nix_unpacked :containers_dir :filename :root :user + require container_nix_unpacked :containers_dir :filename :root \ + user=container-$vars[image_name] } confz_container_nix_packages_installed_check() {