diff options
| author | Sandro Jäckel <sandro.jaeckel@sap.com> | 2022-10-26 16:51:29 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-11-09 23:45:33 +0100 |
| commit | 182575a60d7e897b62a837fdd8047ae4fe44b4c6 (patch) | |
| tree | b94f1e2623e17a3193aa638776ad7afdfdc829b5 /nixos/modules/system | |
| parent | 8191089900837e16cf53348a5c66d45306986474 (diff) | |
nixos/kernel: replace boot.isContainer with boot.kernel.enable
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index b71ddf95dc500..45dbaa7646151 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -27,7 +27,7 @@ let # Containers don't have their own kernel or initrd. They boot # directly into stage 2. - ${optionalString (!config.boot.isContainer) '' + ${optionalString config.boot.kernel.enable '' if [ ! -f ${kernelPath} ]; then echo "The bootloader cannot find the proper kernel image." echo "(Expecting ${kernelPath})" diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 8a1630f7e3ebb..6783f8ec62ff9 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -20,6 +20,9 @@ in ###### interface options = { + boot.kernel.enable = mkEnableOption (lib.mdDoc "the Linux kernel. This is useful for systemd-like containers which do not require a kernel.") // { + default = true; + }; boot.kernel.features = mkOption { default = {}; @@ -258,7 +261,7 @@ in ]; }) - (mkIf (!config.boot.isContainer) { + (mkIf config.boot.kernel.enable { system.build = { inherit kernel; }; system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages; |