From d6108919b1f1b8cc7b88684fce12acf96d6a7221 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 13:09:06 +0000
Subject: [PATCH] * The loopback device is in a module now.  Since it's not  
 automatically loaded by the kernel, load it at boot time. * Put the ext2
 module (which used to be built in) in the initrd to   prevent unexpected
 breakage.

svn path=/nixos/trunk/; revision=18963
---
 modules/system/boot/kernel.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index d7facd765195..d167789d77c0 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -98,7 +98,7 @@ let
             "ide_generic"
             
             # Filesystems.
-            "ext3"
+            "ext2" "ext3"
             
             # Support USB keyboards, in case the boot fails and we only have
             # a USB keyboard.
@@ -171,6 +171,8 @@ in
   system.build = { inherit kernel; };
   system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
+  boot.kernelModules = [ "loop" ];
+
   # The Linux kernel >= 2.6.27 provides firmware.
   hardware.firmware = [ "${kernel}/lib/firmware" ];
 }