nixos/boot: merge to maintain commit signatures

This commit is contained in:
Philip Taron
2024-12-02 08:58:37 -08:00
50645 changed files with 2619879 additions and 1793353 deletions

View File

@@ -7,7 +7,7 @@ with lib;
###### interface
options = {
boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systems like containers which do not require a kernel") // {
boot.modprobeConfig.enable = mkEnableOption "modprobe config. This is useful for systems like containers which do not require a kernel" // {
default = true;
};
@@ -19,7 +19,7 @@ with lib;
type = types.listOf types.str;
default = [];
example = [ "cirrusfb" "i2c_piix4" ];
description = lib.mdDoc ''
description = ''
List of names of kernel modules that should not be loaded
automatically by the hardware probing code.
'';
@@ -31,7 +31,7 @@ with lib;
''
options parport_pc io=0x378 irq=7 dma=1
'';
description = lib.mdDoc ''
description = ''
Any additional configuration to be appended to the generated
{file}`modprobe.conf`. This is typically used to
specify module options. See