[readonly/geninitrd/devel: 190/334] Check for /sbin/lvdisplay and /sbin/pvdisplay existence instead of /sbin/lvm (part of lvm2 package).

draenog draenog at pld-linux.org
Sat Nov 2 19:27:29 CET 2013


commit 9f2d32ed904114eb358bbd674fb214639613c411
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Mar 31 16:33:05 2004 +0000

    Check for /sbin/lvdisplay and /sbin/pvdisplay existence instead of /sbin/lvm (part of lvm2 package).
    
    
    svn-id: @3844

 geninitrd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index 58257c5..ba2bd84 100755
--- a/geninitrd
+++ b/geninitrd
@@ -578,8 +578,8 @@ find_modules_for() {
 		BASICMODULES="$BASICMODULES -${loopFs}"
 		# don't have any clue, how is this supposed to work
 	elif ls -l "$1" | awk '{if (/^b/) { if ($5 == "58,") { exit 0; } else { exit 1; } } else { exit 1; }}' || /sbin/lvdisplay "$1" > /dev/null 2>&1 ; then
-		if [ ! -f /sbin/initrd-lvm -o ! -x /sbin/lvm ] ; then
-			echo "ERROR: root on LVM but /sbin/initrd-lvm and /sbin/lvm not found." >&2
+		if [ ! -f /sbin/initrd-lvm -o ! -x /sbin/lvdisplay -o ! -x /sbin/pvdisplay ] ; then
+			echo "ERROR: root on LVM but /sbin/initrd-lvm, /sbin/lvdisplay and /sbin/pvdisplay not found." >&2
 			echo "Please install lvm(2) and lvm(2)-initrd package and rerun $0." >&2
 			exit 1
 		fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/398807324938659207036e520c0950a61ef50c11



More information about the pld-cvs-commit mailing list