From c39f493ebb4b619e2b6d2cfd4e12c531861213c8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 7 Aug 2012 18:09:08 -0400
Subject: [PATCH] Minor reorganization

---
 modules/system/boot/kernel.nix  | 2 +-
 modules/system/boot/stage-1.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index ab9961960795..62b68c560d13 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -228,8 +228,8 @@ let kernel = config.boot.kernelPackages.kernel; in
 
     # The config options that all modules can depend upon
     system.requiredKernelConfig = with config.lib.kernelConfig; [
+      # !!! Should this really be needed?
       (isYes "MODULES")
-      (isYes "BLK_DEV_INITRD")
       (isYes "BINFMT_ELF")
     ];
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index aa86f14066da..01ecd839f556 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -323,5 +323,6 @@ in {
 
   system.requiredKernelConfig = with config.lib.kernelConfig; [
     (isYes "TMPFS")
+    (isYes "BLK_DEV_INITRD")
   ];
 }