SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Wed Nov 14 00:56:27 2007
New Revision: 9049

Modified:
   geninitrd/trunk/geninitrd
Log:
- can extract WWID directly from DM_UUID, no need to solve deps

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Wed Nov 14 00:56:27 2007
@@ -729,18 +729,15 @@
 	if [ -z "$DM_NAME" ]; then
 		die "dm_export failed unexpectedly"
 	fi
-	mpath_wwid=${DM_UUID##*-}
-
-	if [ "$DM_TARGET_TYPES" != multipath ]; then
-		local dep deps=$(dm_deps $DM_NAME)
-		# must be a partition, fetch deps and retry
-		for dep in $deps; do
-			find_modules_multipath $dep && return
-		done
-		die "Couldn't find underlying device from $DM_NAME"
-	fi
 
+	# Partition:
+	#  DM_NAME=LUN-28p1
+	#  DM_UUID=part1-mpath-36006016002c11800a0aa05fbfae0db11
+	# Disk:
+	#  DM_NAME=LUN-28
+	#  DM_UUID=mpath-36006016002c11800a0aa05fbfae0db11
 	MPATH_WWID=${DM_UUID##*-}
+
 	local info=$(multipath -l $MPATH_WWID)
 	if [ -z "$info" ]; then
 		return 1