SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Fri Nov  2 02:02:31 2007
New Revision: 8956

Modified:
   geninitrd/trunk/geninitrd
Log:
- another fix to avoid lvdisplay failure to kill /linuxrc

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Fri Nov  2 02:02:31 2007
@@ -1694,10 +1694,11 @@
 			# Find out major/minor
 			attrs="$(lvm.static lvdisplay --ignorelockingfailure -c $LVM_ROOTDEV 2>/dev/null)"
 			if [ "$attrs" ]; then
-				majmin="${attrs#*/}"
-				majmin="${majmin#*:*:*:*:*:*:*:*:*:*:*:*}"
-				major="${majmin%:*}"
-				minor="${majmin#*:}"
+				majmin="${attrs#*$LVM_ROOTDEV*:*:*:*:*:*:*:*:*:*:*:*}"
+				if [ "$majmin" != "$attrs" ]; then
+					major="${majmin%:*}"
+					minor="${majmin#*:}"
+				fi
 			fi
 
 			if [ "$major" -a "$minor" ]; then