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/modules/system | |
| parent | 08c652a55fb333a145c37eafc784da36d66efa32 (diff) | |
nixos/activation/bootspec: fix document output path
The RFC currently stipulates the document will be available at `$out/boot.json`.
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/activation/bootspec.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix index da76bf9084af8..e0a6880a6f4fe 100644 --- a/nixos/modules/system/activation/bootspec.nix +++ b/nixos/modules/system/activation/bootspec.nix @@ -54,7 +54,7 @@ let specialisationInjector = let specialisationLoader = (lib.mapAttrsToList - (childName: childToplevel: lib.escapeShellArgs [ "--slurpfile" childName "${childToplevel}/bootspec/${filename}" ]) + (childName: childToplevel: lib.escapeShellArgs [ "--slurpfile" childName "${childToplevel}/${filename}" ]) children); in lib.escapeShellArgs [ @@ -66,7 +66,7 @@ let '' mkdir -p $out/bootspec - ${toplevelInjector} | ${specialisationInjector} > $out/bootspec/${filename} + ${toplevelInjector} | ${specialisationInjector} > $out/${filename} ''; validator = pkgs.writeCueValidator ./bootspec.cue { diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 0bb3628ceed9a..00b11471e1c71 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -81,7 +81,7 @@ let ${optionalString (!config.boot.isContainer && config.boot.bootspec.enable) '' ${config.boot.bootspec.writer} - ${config.boot.bootspec.validator} "$out/bootspec/${config.boot.bootspec.filename}" + ${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}" ''} ${config.system.extraSystemBuilderCmds} |