From 175f99f6365164c26e758a0850e290a5be1c8f61 Mon Sep 17 00:00:00 2001
From: Peter Hjalmarsson <xake@rymdraket.net>
Date: Mon, 31 Jan 2011 06:07:38 +0100
Subject: [PATCH] Use /bin/lvm directly

---
 defaults/initrd.scripts |    6 +++---
 defaults/linuxrc        |    6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 20acc11..417a99d 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -637,7 +637,7 @@ startVolumes() {
 
 	if [ "${USE_LVM_NORMAL}" = '1' ]
 	then
-		if [ -e '/bin/vgscan' -a -e '/bin/vgchange' ]
+		if [ -e '/bin/lvm ]
 		then
 			for dev in ${RAID_DEVICES}
 			do
@@ -645,9 +645,9 @@ startVolumes() {
 			done
 
 			good_msg "Scanning for Volume Groups"
-			/bin/vgscan --ignorelockingfailure --mknodes 2>/dev/null
+			[ -d /etc/lvm/cache ] && /bin/lvm vgscan
 			good_msg "Activating Volume Groups"
-			/bin/vgchange -ay --sysinit 2>/dev/null
+			/bin/lvm vgchange -ay --sysinit
 
 			# Disable EVMS since lvm is activated and they dont work together.
 			if [ "${USE_EVMS_NORMAL}" = '1' ]
diff --git a/defaults/linuxrc b/defaults/linuxrc
index d8b910c..bbe397e 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -31,12 +31,6 @@ then
 	[ -e /linuxrc ] && rm /linuxrc
 fi
 
-if [ -e /bin/lvm ]
-then
-	[ -e /bin/vgscan   ] || ln -s /bin/lvm /bin/vgscan
-	[ -e /bin/vgchange ] || ln -s /bin/lvm /bin/vgchange
-fi
-
 quiet_kmsg
 
 CMDLINE=`cat /proc/cmdline`
-- 
1.7.4.rc3