=== modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2022-06-25 16:30:01 +0000 +++ new/zsh-functions/confz_containers_init 2022-06-25 16:12:01 +0000 @@ -1004,11 +1004,11 @@ require fs_m filename="$vars[root]/bin" mode=0755 require fs_o filename="$vars[root]/bin" owner=$vars[uid]:$vars[gid] - # require fs_l filename="$vars[root]/bin/execlineb" \ - # destination="/root/.nix-profile/bin/execlineb" + require fs_l filename="$vars[root]/bin/execlineb" \ + destination="/root/.nix-profile/bin/execlineb" - # require fs_l filename="$vars[root]/bin/zsh" \ - # destination="/root/.nix-profile/bin/zsh" + require fs_l filename="$vars[root]/bin/zsh" \ + destination="/root/.nix-profile/bin/zsh" } confz_container_nix_image_from_release_check() { @@ -1165,32 +1165,6 @@ # owner=$vars[uid]:$vars[gid] } -confz_container_nix_bin_linked_check() { - checkvars containers_dir image_name - - local root=$vars[containers_dir]/systems/$vars[image_name] - local profile_dir=$root/root/.nix-profile - zstat -L -H stat_info $profile_dir - # while it's a symlink - while (( $stat_info[mode] >> 12 == 10 )); do - if [[ $stat_info[link] == /* ]]; then - profile_dir=$root$stat_info[link] - else - profile_dir=${profile_dir:h}/$stat_info[link] - fi - zstat -L -H stat_info $profile_dir - done - [[ -d $profile_dir ]] || \ - die "Could not find profile directory: ${(qqq)profile_dir}" - - local b - for b in $profile_dir/bin/*; do - [[ -e $root/bin/$b:t ]] || \ - require fs_l filename="$root/bin/${b:t}" \ - destination=../root/.nix-profile/bin/$b:t - done -} - confz_container_nix_packages_installed_check() { checkvars containers_dir image_name packages svscan_dir @@ -1200,8 +1174,7 @@ local root=$vars[containers_dir]/systems/$vars[image_name] local -A stat_info - # local profile_dir=$root/nix/var/nix/profiles/per-user/root/profile - local profile_dir=$root/root/.nix-profile + local profile_dir=$root/nix/var/nix/profiles/per-user/root/profile zstat -L -H stat_info $profile_dir # while it's a symlink while (( $stat_info[mode] >> 12 == 10 )); do === modified file 'zsh-functions/confz_site_containers_init' --- old/zsh-functions/confz_site_containers_init 2022-06-25 16:30:01 +0000 +++ new/zsh-functions/confz_site_containers_init 2022-06-23 10:12:29 +0000 @@ -78,8 +78,6 @@ :containers_dir :arch :repository :image_name require container_void_packages_installed \ :containers_dir :svscan_dir :image_name :packages - require container_void_bin_linked \ - :containers_dir :image_name } confz_site_container_nix_check() {