=== modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2022-06-22 23:08:19 +0000 +++ new/zsh-functions/confz_containers_init 2022-06-22 22:50:53 +0000 @@ -933,7 +933,7 @@ :checksum :checksum_algo \?hostname \?locale } -confz_container_nix_bootstrap_utils_apk_check() { +confz_container_nix_bootstrap_utils_check() { checkvars user root arch uid gid defvar keys_dir /etc/apk/keys defvar apk_executable apk @@ -961,22 +961,9 @@ --root $vars[root] --keys-dir $vars[keys_dir] --no-scripts - add alpine-keys apk-tools busybox - ) - [[ -f $vars[root]/sbin/apk ]] -} - -confz_container_nix_bootstrap_utils_check() { - checkvars root svscan_dir image_name - - require container_nix_bootstrap_utils_apk :root \?arch \?uid \?gid \ - \?keys_dir \?apk_executable \?mirror \?release \?repositories - - do_command=( - $commands[cd] $vars[svscan_dir]/container.$vars[image_name].sysroot - container_sysroot_run - /bin/apk fix - ) + add alpine-keys busybox + ) + [[ -f $vars[root]/bin/sh ]] } confz_container_nix_unpacked_check() { @@ -991,19 +978,8 @@ [[ -f $vars[root]/${vars[filename]%.tar.*}/install ]] } -confz_container_nix_image_installed_check() { - checkvars filename image_name svscan_dir root - - do_command=( - $commands[cd] $vars[svscan_dir]/container.$vars[image_name].sysroot - container_sysroot_run - $vars[root]/${vars[filename]%.tar.*}/install - ) - [[ -d $vars[root]/nix/store ]] -} - confz_container_nix_image_check() { - checkvars containers_dir image_name url checksum svscan_dir + checkvars containers_dir image_name url checksum defvar checksum_algo sha256 defvar hostname $vars[image_name] @@ -1018,15 +994,10 @@ require container_sysroot_user %uid %gid :containers_dir :image_name require container_generic_layout :uid :gid :root - require container_service_sysroot :containers_dir :svscan_dir \ - :image_name - - require container_nix_bootstrap_utils :user :root :uid :gid :svscan_dir \ + require container_nix_bootstrap_utils :user :root :uid :gid \ arch=x86_64 # TODO: infer correct arch require container_nix_unpacked :containers_dir :filename :root :user - require container_nix_image_installed :filename :root :image_name \ - :svscan_dir } confz_container_nix_packages_installed_check() {