commit e3e75a2b8e21092ff96ba0124cd5cf226d542223 parent c664bbe30d570af2b5e2cc5f2cbb4c0b53328e70 Author: Jan Pobříslo <ccx@te2000.cz> Date: Thu, 23 Jun 2022 00:50:53 +0200 Create /etc/apk/repositories for installing nix bootstrap Diffstat:
| M | zsh-functions/confz_containers_init | | | 19 | +++++++++++++++++-- |
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init @@ -934,9 +934,24 @@ confz_container_nix_image_from_release_check() { } confz_container_nix_bootstrap_utils_check() { - checkvars user root arch + checkvars user root arch uid gid defvar keys_dir /etc/apk/keys defvar apk_executable apk + defvar mirror http://mirror.fit.cvut.cz/alpine + defvar release edge + defvar repositories main + + local -a repositories=( $vars[mirror]/$vars[release]/${^=vars[repositories]} ) + + require fs_d filename="$vars[root]/etc/apk" + require fs_m filename="$vars[root]/etc/apk" mode=0755 + require fs_o filename="$vars[root]/etc/apk" owner=$vars[uid]:$vars[gid] + + require fs_contentnl filename="$vars[root]/etc/apk/repositories" \ + content="${(F)repositories}" + require fs_m filename="$vars[root]/etc/apk/repositories" mode=0644 + require fs_o filename="$vars[root]/etc/apk/repositories" owner=$vars[uid]:$vars[gid] + do_command=( s6-setuidgid $vars[user] $vars[apk_executable] @@ -979,7 +994,7 @@ confz_container_nix_image_check() { require container_sysroot_user %uid %gid :containers_dir :image_name require container_generic_layout :uid :gid :root - require container_nix_bootstrap_utils :user :root \ + 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