From c0feba86fb90f56028dc11812d8aed9e068a2089 Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 10 Feb 2024 00:28:16 +0100 Subject: [PATCH] nixos/test-instrumentation: use full path to env It is sometimes useful to have a seprate /usr partition to make systemd tools happy (e.g. repart, sysupdate, gpt-auto-generator etc.). The test script should not depend on usrbinenv to make this possible. --- nixos/modules/testing/test-instrumentation.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 6aa718c1975d..50a54a006415 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -42,8 +42,10 @@ let # Otherwise we get errors on the terminal because bash tries to # setup things like job control. # Note: calling bash explicitly here instead of sh makes sure that - # we can also run non-NixOS guests during tests. - PS1= exec /usr/bin/env bash --norc /dev/hvc0 + # we can also run non-NixOS guests during tests. This, however, is + # mostly futureproofing as the test instrumentation is still very + # tightly coupled to NixOS. + PS1= exec ${pkgs.coreutils}/bin/env bash --norc /dev/hvc0 ''; serviceConfig.KillSignal = "SIGHUP"; }; @@ -121,7 +123,9 @@ in } ]; - contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env"; + storePaths = [ + "${pkgs.coreutils}/bin/env" + ]; }) ];