From e50a7e5f327787f242fa07057725c594235a5889 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 16:32:30 +0000
Subject: [PATCH] * Removed the boot.initrd.lvm option for simplicity.

svn path=/nixos/trunk/; revision=19330
---
 modules/system/boot/stage-1-init.sh | 10 ++++------
 modules/system/boot/stage-1.nix     | 23 +++++------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index e74e363c83dd..2d95042d109a 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -117,12 +117,10 @@ udevd --daemon
 udevadm trigger
 udevadm settle
 
-if type -p dmsetup > /dev/null; then
-    echo "starting device mapper and LVM..."
-    dmsetup mknodes
-    lvm vgscan --ignorelockingfailure
-    lvm vgchange -ay --ignorelockingfailure
-fi
+echo "starting device mapper and LVM..."
+dmsetup mknodes
+lvm vgscan --ignorelockingfailure
+lvm vgchange -ay --ignorelockingfailure
 
 if test -n "$debug1devices"; then fail; fi
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 4f24783b5c6b..137eaa9e379b 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -20,14 +20,6 @@ let
       ";
     };
 
-    boot.initrd.lvm = mkOption {
-      default = true;
-      description = "
-        Whether to include lvm in the initial ramdisk. You should use this option
-        if your ROOT device is on lvm volume.
-      ";
-    };
-
     boot.initrd.enableSplashScreen = mkOption {
       default = true;
       description = "
@@ -105,7 +97,6 @@ let
   # work.
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
-      lvm2 = if config.boot.initrd.lvm then pkgs.lvm2 else null;
       allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd
       doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
     }
@@ -143,11 +134,9 @@ let
       cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
 
       # Copy dmsetup and lvm, if we need it.
-      if test -n "$lvm2"; then
-        cp $lvm2/sbin/dmsetup $out/bin/dmsetup
-        cp $lvm2/sbin/lvm $out/bin/lvm
-        cp $lvm2/lib/libdevmapper.so.*.* $out/lib
-      fi
+      cp ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
+      cp ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
+      cp ${pkgs.lvm2}/lib/libdevmapper.so.*.* $out/lib
 
       # Add RAID mdadm tool.
       cp ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm
@@ -197,10 +186,8 @@ let
       $out/bin/fsck -N
       $out/bin/udevadm --version
       $out/bin/blkid -v 2>&1 | grep "blkid from util-linux-ng"
-      if test -n "$lvm2"; then
-          $out/bin/dmsetup --version 2>&1 | grep "version:"
-          LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
-      fi
+      $out/bin/dmsetup --version 2>&1 | grep "version:"
+      LVM_SYSTEM_DIR=$out $out/bin/lvm 2>&1 | grep "LVM"
       $out/bin/reiserfsck -V
       $out/bin/mdadm --version
       $out/bin/basename --version