nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-30 00:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

* devicemapper -> lvm2.

Browse Source 
svn path=/nixos/trunk/; revision=19294
This commit is contained in:
Eelco Dolstra 2010-01-07 16:14:50 +00:00
parent 9a0789a81e
commit 0595b7f89d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/system/boot/stage-1.nix
View File

@ -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

4
modules/tasks/lvm.nix
View File

@ -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 ];
};