From 867d814d277d8153e91cf5d63b43f8815d0410a6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 1 Sep 2007 18:05:46 +0000
Subject: [PATCH] Remove unneeded copy of lvm in initrd.

Something replaces symlinks in initrd with copies. Removed symlinks to lvm and
changed syntax (vgscan -> lvm vgscan).

svn path=/nixos/trunk/; revision=9233
---
 boot/boot-stage-1-init.sh | 4 ++--
 system/system.nix         | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/boot/boot-stage-1-init.sh b/boot/boot-stage-1-init.sh
index e2171dc3a71..68a8b236afd 100644
--- a/boot/boot-stage-1-init.sh
+++ b/boot/boot-stage-1-init.sh
@@ -76,8 +76,8 @@ udevsettle
 if type -p dmsetup > /dev/null; then
   echo "dmsetup found, starting device mapper and lvm"
   dmsetup mknodes
-  vgscan --ignorelockingfailure
-  vgchange -ay --ignorelockingfailure
+  lvm vgscan --ignorelockingfailure
+  lvm vgchange -ay --ignorelockingfailure
 fi
 
 if test -n "$debug1devices"; then fail; fi
diff --git a/system/system.nix b/system/system.nix
index 2f9104e2155..082af065d02 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -63,8 +63,6 @@ rec {
       if test -n \"$devicemapper\"; then
         cp $devicemapper/sbin/dmsetup.static $out/bin/dmsetup
         cp $lvm2/sbin/lvm.static $out/bin/lvm
-        ln -s lvm $out/bin/vgscan
-        ln -s lvm $out/bin/vgchange
       fi
       cp $utillinux/bin/mount $utillinux/bin/umount $utillinux/sbin/pivot_root $out/bin
       cp -p $e2fsprogs/sbin/fsck* $e2fsprogs/sbin/e2fsck $out/bin