Author: eelco
Date: Mon Sep 5 14:58:26 2011
New Revision: 29027
URL: https://svn.nixos.org/websvn/nix/?rev=29027&sc=1
Log:
* Force loading of the CFQ module, i.e. don't do it on demand — that
seems to cause weird modprobe hangs.
Modified:
nixos/trunk/modules/system/boot/kernel.nix
Modified: nixos/trunk/modules/system/boot/kernel.nix
==============================================================================
--- nixos/trunk/modules/system/boot/kernel.nix Mon Sep 5 13:29:33 2011
(r29026)
+++ nixos/trunk/modules/system/boot/kernel.nix Mon Sep 5 14:58:26 2011
(r29027)
@@ -165,9 +165,6 @@
# 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 @@
"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.
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
