From 0595b7f89d8bc13668b06a9a4ed1db322f90d0c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2010 16:14:50 +0000
Subject: [PATCH] * devicemapper -> lvm2.

svn path=/nixos/trunk/; revision=19294
---
 modules/system/boot/stage-1.nix | 13 ++++++-------
 modules/tasks/lvm.nix           |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 4b51ce1b024a..a62f79aab155 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -115,7 +115,6 @@ let
   # work.
   extraUtils = pkgs.runCommand "extra-utils"
     { buildInputs = [pkgs.nukeReferences];
-      devicemapper = if config.boot.initrd.lvm then pkgs.devicemapper else null;
       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");
@@ -153,11 +152,11 @@ let
 
       cp -pd ${pkgs.e2fsprogs}/lib/lib*.so.* $out/lib
 
-      # Copy devicemapper and lvm, if we need it.
-      if test -n "$devicemapper"; then
-        cp $devicemapper/sbin/dmsetup $out/bin/dmsetup
-        cp $devicemapper/lib/libdevmapper.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
 
       # Add RAID mdadm tool.
@@ -208,8 +207,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 "$devicemapper"; then
-          $out/bin/dmsetup --version | grep "version:"
+      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/reiserfsck -V
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index a7c3c7540c00..d5204f1debac 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -14,7 +14,7 @@
             # Load the device mapper.
             ${config.system.sbin.modprobe}/sbin/modprobe dm_mod || true
 
-            ${pkgs.devicemapper}/sbin/dmsetup mknodes
+            ${pkgs.lvm2}/sbin/dmsetup mknodes
             
             # Scan for block devices that might contain LVM physical volumes
             # and volume groups.
@@ -30,7 +30,7 @@
         task = true;
       };
 
-    environment.systemPackages = [ pkgs.devicemapper pkgs.lvm2 ];
+    environment.systemPackages = [ pkgs.lvm2 ];
 
   };