SVN: geninitrd/trunk/mod-lvm.sh

[glen]

Author: glen
Date: Thu Jul 16 14:37:57 2009
New Revision: 10418

Modified:
   geninitrd/trunk/mod-lvm.sh
Log:
- use only lvm2-initrd package tools.

Modified: geninitrd/trunk/mod-lvm.sh
==============================================================================
--- geninitrd/trunk/mod-lvm.sh	(original)
+++ geninitrd/trunk/mod-lvm.sh	Thu Jul 16 14:37:57 2009
@@ -29,7 +29,7 @@
 setup_mod_lvm() {
 	lvm=$(find_tool $initrd_dir/lvm /sbin/initrd-lvm)
 
-	if [ ! -x /sbin/lvm ] || [ ! -x "$lvm" ]; then
+	if [ ! -x "$lvm" ]; then
 		USE_LVM=no
 	fi
 
@@ -66,7 +66,7 @@
 		return 0
 	fi
 
-	/sbin/lvm lvdisplay "$node" > /dev/null 2>&1
+	$lvm lvdisplay "$node" > /dev/null 2>&1
 	rc=$?
 	if [ $rc -gt 127 ]; then
 		# lvdisplay terminated by signal! most likely it segfaulted.
@@ -97,7 +97,7 @@
 			find_modules_for_devpath $device
 		done
 	else
-		die "I wasn't able to find PV (via lvdisplay and pvdisplay). You can try to set PVDEVICES in /etc/sysconfig/geninitrd."
+		die "I wasn't able to find PV. You can try to set PVDEVICES in /etc/sysconfig/geninitrd."
 	fi
 
 	if [ "$LVMTOOLSVERSION" = "2" ]; then
@@ -169,7 +169,7 @@
 			echo ']' >> "$DESTDIR/etc/lvm.conf"
 		fi
 		# XXX filter= must be on one line!
-		lvm dumpconfig | awk '/filter=/' >> "$DESTDIR/etc/lvm.conf"
+		$lvm dumpconfig | awk '/filter=/' >> "$DESTDIR/etc/lvm.conf"
 		echo "}" >> "$DESTDIR/etc/lvm.conf"
 
 		initrd_gen_devices
@@ -251,7 +251,7 @@
 find_lvm_pv() {
 	local vg="$1"
 
-	local pv=$(/sbin/vgs --noheadings -o pv_name  "$vg")
+	local pv=$($lvm vgs --noheadings -o pv_name  "$vg")
 	echo $pv
 }
 
@@ -261,6 +261,6 @@
 find_lvm_vg() {
 	local devnode="$1"
 
-	local vg=$(/sbin/lvs --noheadings -o vg_name  "$devnode")
+	local vg=$($lvm lvs --noheadings -o vg_name  "$devnode")
 	echo $vg
 }