pull module blacklist from Ubuntu and use it by default

People often have serious problems due to bogus modules like *fb.
This commit is contained in:
Vladimír Čunát
2014-01-28 12:52:36 +01:00
parent 849b383f4d
commit 5acaa980a5
3 changed files with 36 additions and 18 deletions
+6 -18
View File
@@ -68,7 +68,10 @@ with pkgs.lib;
config = mkIf (!config.boot.isContainer) {
environment.etc = singleton
environment.etc = [
{ source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
target = "modprobe.d/ubuntu.conf";
}
{ source = pkgs.writeText "modprobe.conf"
''
${flip concatMapStrings config.boot.blacklistedKernelModules (name: ''
@@ -77,26 +80,11 @@ with pkgs.lib;
${config.boot.extraModprobeConfig}
'';
target = "modprobe.d/nixos.conf";
};
}
];
environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ];
boot.blacklistedKernelModules =
[ # This module is for debugging and generates gigantic amounts
# of log output, so it should never be loaded automatically.
"evbug"
# This module causes ALSA to occassionally select the wrong
# default sound device, and is little more than an annoyance
# on modern machines.
"snd_pcsp"
# The cirrusfb module prevents X11 from starting. FIXME:
# Ubuntu blacklists all framebuffer devices because they're
# "buggy" and cause suspend problems. Maybe we should too?
"cirrusfb"
];
system.activationScripts.modprobe =
''
# Allow the kernel to find our wrapped modprobe (which searches