mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
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.
This commit is contained in:
parent
33ca948d6a
commit
c0feba86fb
@ -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"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user