diff options
| author | Cole Helbling <cole.e.helbling@outlook.com> | 2022-12-21 14:03:40 -0800 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2022-12-22 07:56:09 -0800 |
| commit | 21f4afd79987369f910d91bc2bd37e4f66a4a1c9 (patch) | |
| tree | b8ece7ed0d90bfc7b0147d5e6494c0d7c9053e83 /nixos/tests/bootspec.nix | |
| parent | 08c652a55fb333a145c37eafc784da36d66efa32 (diff) | |
| download | nixpkgs-21f4afd79987369f910d91bc2bd37e4f66a4a1c9.tar nixpkgs-21f4afd79987369f910d91bc2bd37e4f66a4a1c9.tar.gz nixpkgs-21f4afd79987369f910d91bc2bd37e4f66a4a1c9.tar.bz2 nixpkgs-21f4afd79987369f910d91bc2bd37e4f66a4a1c9.tar.lz nixpkgs-21f4afd79987369f910d91bc2bd37e4f66a4a1c9.tar.xz nixpkgs-21f4afd79987369f910d91bc2bd37e4f66a4a1c9.tar.zst nixpkgs-21f4afd79987369f910d91bc2bd37e4f66a4a1c9.zip | |
nixos/activation/bootspec: fix document output path
The RFC currently stipulates the document will be available at `$out/boot.json`.
Diffstat (limited to 'nixos/tests/bootspec.nix')
| -rw-r--r-- | nixos/tests/bootspec.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixos/tests/bootspec.nix b/nixos/tests/bootspec.nix index 13360bb1eaa..04fd8cd691d 100644 --- a/nixos/tests/bootspec.nix +++ b/nixos/tests/bootspec.nix @@ -43,7 +43,7 @@ in machine.start() machine.wait_for_unit("multi-user.target") - machine.succeed("test -e /run/current-system/bootspec/boot.json") + machine.succeed("test -e /run/current-system/boot.json") ''; }; @@ -65,7 +65,7 @@ in machine.start() machine.wait_for_unit("multi-user.target") - machine.succeed("test -e /run/current-system/bootspec/boot.json") + machine.succeed("test -e /run/current-system/boot.json") ''; }; @@ -86,7 +86,7 @@ in machine.start() machine.wait_for_unit("multi-user.target") - machine.succeed("test -e /run/current-system/bootspec/boot.json") + machine.succeed("test -e /run/current-system/boot.json") ''; }; @@ -107,11 +107,11 @@ in machine.start() machine.wait_for_unit("multi-user.target") - machine.succeed("test -e /run/current-system/bootspec/boot.json") - machine.succeed("test -e /run/current-system/specialisation/something/bootspec/boot.json") + machine.succeed("test -e /run/current-system/boot.json") + machine.succeed("test -e /run/current-system/specialisation/something/boot.json") - sp_in_parent = json.loads(machine.succeed("jq -r '.v1.specialisation.something' /run/current-system/bootspec/boot.json")) - sp_in_fs = json.loads(machine.succeed("cat /run/current-system/specialisation/something/bootspec/boot.json")) + sp_in_parent = json.loads(machine.succeed("jq -r '.v1.specialisation.something' /run/current-system/boot.json")) + sp_in_fs = json.loads(machine.succeed("cat /run/current-system/specialisation/something/boot.json")) assert sp_in_parent == sp_in_fs['v1'], "Bootspecs of the same specialisation are different!" ''; @@ -135,7 +135,7 @@ in machine.wait_for_unit("multi-user.target") current_os_release = machine.succeed("cat /etc/os-release") - bootspec_os_release = machine.succeed("cat $(jq -r '.v1.extensions.osRelease' /run/current-system/bootspec/boot.json)") + bootspec_os_release = machine.succeed("cat $(jq -r '.v1.extensions.osRelease' /run/current-system/boot.json)") assert current_os_release == bootspec_os_release, "Filename referenced by extension has unexpected contents" ''; |