diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index 7be04c74056..7e5cc010ef9 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -3,13 +3,17 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "kexec"; meta = with lib.maintainers; { - maintainers = [ eelco ]; + maintainers = [ flokli lassulus ]; }; nodes = { node1 = { ... }: { virtualisation.vlans = [ ]; - virtualisation.memorySize = 2 * 1024; + virtualisation.memorySize = 4 * 1024; + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; }; node2 = { modulesPath, ... }: { @@ -28,16 +32,14 @@ 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 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.execute('${nodes.node2.config.system.build.kexecBoot}/kexec-boot', check_return=False) - node1.connected = False - node1.connect() - node1.wait_for_unit("multi-user.target") + node1.succeed('! test -e /run/foo') node1.shutdown() '';