diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-03 18:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-03 18:01:07 +0000 |
| commit | c46200d454dd33ed6bd76009b11842a8d96dd4eb (patch) | |
| tree | 5b15251664edbac92ec03b3957a2fa71bfb5d44e /nixos/modules/system/boot/stage-1.nix | |
| parent | 90f8f24fca32d7fe7d515f7f0afaeb7153ecc4bd (diff) | |
| parent | 1510ef31015670ba1896a8b9d97ce67068df3af3 (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 7e93d62aa761b..04753a6767d98 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -723,8 +723,12 @@ in } ]; - system.build = - { inherit bootStage1 initialRamdisk initialRamdiskSecretAppender extraUtils; }; + system.build = mkMerge [ + { inherit bootStage1 initialRamdiskSecretAppender extraUtils; } + + # generated in nixos/modules/system/boot/systemd/initrd.nix + (mkIf (!config.boot.initrd.systemd.enable) { inherit initialRamdisk; }) + ]; system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "TMPFS") |