MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #168945 from Lassulus/kexec-tests

Browse source 
nixosTests.kexec: better test if we are in a new system
This commit is contained in:
Robert Hensing 2022-04-25 17:17:32 +02:00 committed by GitHub
commit ecc66a886e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/installer/kexec/kexec-boot.nix
View file

@ -40,7 +40,7 @@
}
{
name = "bzImage";
path = "${config.system.build.kernel}/bzImage";
path = "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}";
}
{
name = "kexec-boot";

10
nixos/tests/kexec.nix
View file

@ -1,5 +1,3 @@
# Test whether fast reboots via kexec work.
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "kexec";
meta = with lib.maintainers; {
@ -18,13 +16,16 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
node2 = { modulesPath, ... }: {
virtualisation.vlans = [ ];
environment.systemPackages = [ pkgs.hello ];
imports = [
"${modulesPath}/installer/kexec/kexec-boot.nix"
"${modulesPath}/profiles/minimal.nix"
];
};
};
testScript = { nodes, ... }: ''
# Test whether reboot via kexec works.
node1.wait_for_unit("multi-user.target")
node1.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(</proc/cmdline)"')
node1.execute("systemctl kexec >&2 &", check_return=False)
@ -32,14 +33,17 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
node1.connect()
node1.wait_for_unit("multi-user.target")
# Check the machine with kexec-boot.nix profile boots up
# Check if the machine with kexec-boot.nix profile boots up
node2.wait_for_unit("multi-user.target")
node2.shutdown()
# Kexec node1 to the toplevel of node2 via the kexec-boot script
node1.succeed('touch /run/foo')
node1.fail('hello')
node1.execute('${nodes.node2.config.system.build.kexecBoot}/kexec-boot', check_return=False)
node1.succeed('! test -e /run/foo')
node1.succeed('hello')
node1.succeed('[ "$(hostname)" = "node2" ]')
node1.shutdown()
'';