SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Tue Nov 13 19:51:50 2007
New Revision: 9042

Modified:
   geninitrd/trunk/geninitrd
Log:
- suffix dm-multipath partitions with pN
- allow wwid= kernel commandline parameter to specify which multipath wwid to activate

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Tue Nov 13 19:51:50 2007
@@ -1042,14 +1042,28 @@
 	initrd_gen_devices
 
 	mount_sys
-	echo "export multipath_id=$MULTIPATH_ID" | add_linuxrc
+	echo "export WWID=$MULTIPATH_ID" | add_linuxrc
 	add_linuxrc <<-'EOF'
+		# parse wwid= from kernel commandline
+		for arg in $CMDLINE; do
+			if [ "${arg##wwid=}" != "${arg}" ]; then
+				WWID=${arg##wwid=}
+				if [ "$WWID" = "*" ]; then
+					# '*' would mean activate all WWID-s
+					WWID=
+					echo "multipath: Activating all WWID-s"
+				else
+					echo "multipath: Activating WWID=$WWID"
+				fi
+			fi
+		done
+
 		debugshell
-		/sbin/multipath -v 0 $multipath_id
+		/sbin/multipath -v 0 $WWID
 
 		for a in /dev/mapper/*; do
 			[ $a = /dev/mapper/control ] && continue
-			/sbin/kpartx -a $a
+			/sbin/kpartx -a -p p $a
 		done
 		debugshell
 	EOF