nixos-install: clear executable cache after entering chroot (NixOS#35…

…5269)
SherfeyInv · Dec 15, 2024 · c142740 · c142740
2 parents f910ead + b0dfd60
commit c142740
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/pkgs/by-name/ni/nixos-install/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh
@@ -246,6 +246,8 @@ if [[ -z $noBootLoader ]]; then
     export mountPoint
     NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF'
       set -e
+      # Clear the cache for executable locations. They were invalidated by the chroot.
+      hash -r
       # Create a bind mount for each of the mount points inside the target file
       # system. This preserves the validity of their absolute paths after changing
       # the root with `nixos-enter`.

diff --git a/pkgs/by-name/ni/nixos-install/package.nix b/pkgs/by-name/ni/nixos-install/package.nix
@@ -7,6 +7,7 @@
   jq,
   nixos-enter,
   util-linuxMinimal,
+  nixosTests,
 }:
 substituteAll {
   name = "nixos-install";
@@ -29,6 +30,8 @@ substituteAll {
     installManPage ${./nixos-install.8}
   '';
 
+  passthru.tests.installer-simpleUefiSystemdBoot = nixosTests.installer.simpleUefiSystemdBoot;
+
   meta = {
     description = "Install bootloader and NixOS";
     homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install";