diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-06-10 19:10:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-10 19:10:05 +0200 |
| commit | 493b08c4108750685fd95b928745d0e583636788 (patch) | |
| tree | b0f4cc81ba495c9252bb931bcb4cad5c9703e479 /nixos | |
| parent | 5eb2425c0e7fe9d38a1838c60e65d813e9603b0a (diff) | |
| parent | a54e7d299b1dc3af4d6393527c9194ec4dfc6d68 (diff) | |
Merge pull request #237063 from roberth/fix-systemd-boot-test
nixos: Fix systemd-boot test
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/systemd-boot.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 19034b299999..814cdc5f1443 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -207,11 +207,17 @@ in nodes = { inherit common; - machine = { pkgs, ... }: { + machine = { pkgs, nodes, ... }: { imports = [ common ]; boot.loader.systemd-boot.extraFiles = { "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi; }; + + # These are configs for different nodes, but we'll use them here in `machine` + system.extraDependencies = [ + nodes.common.system.build.toplevel + nodes.with_netbootxyz.system.build.toplevel + ]; }; with_netbootxyz = { pkgs, ... }: { @@ -221,9 +227,9 @@ in }; testScript = { nodes, ... }: let - originalSystem = nodes.machine.config.system.build.toplevel; - baseSystem = nodes.common.config.system.build.toplevel; - finalSystem = nodes.with_netbootxyz.config.system.build.toplevel; + originalSystem = nodes.machine.system.build.toplevel; + baseSystem = nodes.common.system.build.toplevel; + finalSystem = nodes.with_netbootxyz.system.build.toplevel; in '' machine.succeed("test -e /boot/efi/fruits/tomato.efi") machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") |