* Generate /etc/modprobe.conf to allow the setting of module options
and the blacklisting of modules. svn path=/nixos/trunk/; revision=18284
This commit is contained in:
parent
b0ba17873c
commit
16c2aa734f
|
@ -121,6 +121,7 @@
|
||||||
./system/activation/activation-script.nix
|
./system/activation/activation-script.nix
|
||||||
./system/activation/top-level.nix
|
./system/activation/top-level.nix
|
||||||
./system/boot/kernel.nix
|
./system/boot/kernel.nix
|
||||||
|
./system/boot/modprobe.nix
|
||||||
./system/boot/stage-1.nix
|
./system/boot/stage-1.nix
|
||||||
./system/boot/stage-2.nix
|
./system/boot/stage-2.nix
|
||||||
./system/etc/etc.nix
|
./system/etc/etc.nix
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
{pkgs, config, ...}:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
with pkgs.lib;
|
||||||
|
|
||||||
###### interface
|
###### interface
|
||||||
let
|
let
|
||||||
inherit (pkgs.lib) mkOption;
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
boot = {
|
boot = {
|
||||||
|
@ -148,31 +149,12 @@ let
|
||||||
built outside of the kernel. Combine these into a single tree of
|
built outside of the kernel. Combine these into a single tree of
|
||||||
symlinks because modprobe only supports one directory.
|
symlinks because modprobe only supports one directory.
|
||||||
";
|
";
|
||||||
merge = pkgs.lib.mergeListOption;
|
merge = mergeListOption;
|
||||||
|
|
||||||
# Convert the list of path to only one path.
|
# Convert the list of path to only one path.
|
||||||
apply = pkgs.aggregateModules;
|
apply = pkgs.aggregateModules;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.sbin.modprobe = mkOption {
|
|
||||||
# should be moved in module-init-tools
|
|
||||||
internal = true;
|
|
||||||
default = pkgs.writeTextFile {
|
|
||||||
name = "modprobe";
|
|
||||||
destination = "/sbin/modprobe";
|
|
||||||
executable = true;
|
|
||||||
text =
|
|
||||||
''
|
|
||||||
#! ${pkgs.stdenv.shell}
|
|
||||||
export MODULE_DIR=${config.system.modulesTree}/lib/modules
|
|
||||||
exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
description = ''
|
|
||||||
Wrapper around modprobe that sets the path to the modules
|
|
||||||
tree.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
80
modules/system/boot/modprobe.nix
Normal file
80
modules/system/boot/modprobe.nix
Normal file
|
@ -0,0 +1,80 @@
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
with pkgs.lib;
|
||||||
|
|
||||||
|
# blacklist "cirrusfb" "i2c_piix4"
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
###### interface
|
||||||
|
|
||||||
|
options = {
|
||||||
|
|
||||||
|
system.sbin.modprobe = mkOption {
|
||||||
|
# should be moved in module-init-tools
|
||||||
|
internal = true;
|
||||||
|
default = pkgs.writeTextFile {
|
||||||
|
name = "modprobe";
|
||||||
|
destination = "/sbin/modprobe";
|
||||||
|
executable = true;
|
||||||
|
text =
|
||||||
|
''
|
||||||
|
#! ${pkgs.stdenv.shell}
|
||||||
|
export MODULE_DIR=${config.system.modulesTree}/lib/modules
|
||||||
|
exec ${pkgs.module_init_tools}/sbin/modprobe "$@"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
description = ''
|
||||||
|
Wrapper around modprobe that sets the path to the modules
|
||||||
|
tree.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.blacklistedKernelModules = mkOption {
|
||||||
|
default = [];
|
||||||
|
example = [ "cirrusfb" "i2c_piix4" ];
|
||||||
|
description = ''
|
||||||
|
List of names of kernel modules that should not be loaded
|
||||||
|
automatically by the hardware probing code.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.extraModprobeConfig = mkOption {
|
||||||
|
default = "";
|
||||||
|
example =
|
||||||
|
''
|
||||||
|
options parport_pc io=0x378 irq=7 dma=1
|
||||||
|
'';
|
||||||
|
description = ''
|
||||||
|
Any additional configuration to be appended to the generated
|
||||||
|
<filename>modprobe.conf</filename>. This is typically used to
|
||||||
|
specify module options. See
|
||||||
|
<citerefentry><refentrytitle>modprobe.conf</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
###### implementation
|
||||||
|
|
||||||
|
config = {
|
||||||
|
|
||||||
|
environment.etc = singleton
|
||||||
|
{ source = pkgs.writeText "modprobe.conf"
|
||||||
|
''
|
||||||
|
${flip concatMapStrings config.boot.blacklistedKernelModules (name: ''
|
||||||
|
blacklist ${name}
|
||||||
|
'')}
|
||||||
|
${config.boot.extraModprobeConfig}
|
||||||
|
'';
|
||||||
|
target = "modprobe.conf";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue