Skip to content

nixos: Fix systemd-boot test #237063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roberth merged 2 commits into from
Jun 10, 2023
Merged

nixos: Fix systemd-boot test #237063

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d55eeb
nixosTests.systemd-boot.switch-test: Fix test
roberth Jun 10, 2023
a54e7d2
nixosTests.systemd-boot.switch-test: Fix warnings
roberth Jun 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions nixos/tests/systemd-boot.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ... }: {
Expand All @@ -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")
Expand Down