From 4b8275d2c49580828719effe025ea49d7ea0a922 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 14:58:26 +0000 Subject: [PATCH] =?UTF-8?q?*=20Force=20loading=20of=20the=20CFQ=20module,?= =?UTF-8?q?=20i.e.=20don't=20do=20it=20on=20demand=20=E2=80=94=20that=20?= =?UTF-8?q?=20=20seems=20to=20cause=20weird=20modprobe=20hangs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixos/trunk/; revision=29027 --- modules/system/boot/kernel.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix index 1f2d688c13f..87fb7bcbd5e 100644 --- a/modules/system/boot/kernel.nix +++ b/modules/system/boot/kernel.nix @@ -165,9 +165,6 @@ let kernel = config.boot.kernelPackages.kernel; in # Unix domain sockets (needed by udev). "unix" - # Provide the CFQ scheduler in the initrd. - "cfq_iosched" - # Misc. stuff. "pcips2" "serio" "atkbd" "xtkbd" ]; @@ -177,7 +174,10 @@ let kernel = config.boot.kernelPackages.kernel; in "dm_mod" # For usual AT keyboards. - "i8042" + "i8042" + + # Provide the CFQ scheduler in the initrd. + "cfq_iosched" ]; # The Linux kernel >= 2.6.27 provides firmware.