Refactoring modules and cleaning up a comment

svn path=/nixos/trunk/; revision=17310
This commit is contained in:
Michael Raskin 2009-09-20 18:15:52 +00:00
parent de555c3705
commit 69cc6ce3ec
4 changed files with 13 additions and 8 deletions

View file

@ -5,7 +5,11 @@
environment.noXlibs = pkgs.lib.mkOption {
default = false;
example = true;
description = "Removing on-by-default X-dependent settings";
description = ''
Switch off the options in the default configuration that require X libraries.
Currently this includes: sshd.forwardX11, dbus, hal, fonts.enableCoreFonts,
fonts.enableFontConfig
'';
};
};
config = pkgs.lib.mkIf config.environment.noXlibs {

View file

@ -26,10 +26,6 @@ rec {
'';
boot.initrd.extraKernelModules = [
"i8042" "pcips2" "serio" "mousedev" "evdev" "psmouse" "sermouse"
"synaptics_i2c" "unix" "usbhid" "uhci_hcd" "ehci_hcd" "ohci_hcd"
"atkbd" "xtkbd"
# CD part
"iso9660" "loop" "squashfs"
];
boot.initrd.allowMissing = true;

View file

@ -28,9 +28,9 @@ let
"selinux=0"
"apm=on"
"acpi=on"
"vga=0x317"
"console=tty1"
"splash=verbose"
"vga=0x317"
];
description = "
The kernel parameters. If you want to add additional
@ -101,12 +101,17 @@ let
# Support USB keyboards, in case the boot fails and we only have
# a USB keyboard.
"uhci_hcd"
"ehci_hcd"
"ohci_hcd"
"usbhid"
# LVM.
"dm_mod"
# All-mod-config case:
"unix"
"i8042" "pcips2" "serio" "atkbd" "xtkbd"
];
description = "
The set of kernel modules in the initial ramdisk used during the
@ -179,7 +184,7 @@ let
in
{
require = [options];
require = [ options ];
system.build = { inherit kernel; };
system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;

View file

@ -31,7 +31,7 @@ let
};
boot.initrd.allowMissing = mkOption {
default = false;
default = true;
description = ''
Allow some initrd components to be missing. Useful for
custom kernel that are changed too often to track needed