add new cdroot_type=foo kernel commandline parameter to override -t iso9660 for bug 182818

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@577 67a159dc-881f-0410-a524-ba9dfbe2cb84

ChangeLog

@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts,
+  generic/linuxrc:
+  add new cdroot_type=foo kernel commandline parameter to override -t iso9660
+  for bug 182818
+
   28 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts:
   put -t auto back to -t iso9660 for mounting a cdrom. this is for bug 162962
 

generic/initrd.scripts

@@ -94,11 +94,12 @@ findmediamount() {
 			then
 				good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT}
 
-				if [ "${media}" = "cdrom" ]; then
+#				if [ "${media}" = "cdrom" ]; then
-					mount -r -t iso9660 ${x} ${mntdir} &>/dev/null
+#					mount -r -t iso9660 ${x} ${mntdir} &>/dev/null
-				else
+#				else
-					mount -r -t auto ${x} ${mntdir} &>/dev/null
+#					mount -r -t auto ${x} ${mntdir} &>/dev/null
-				fi
+#				fi
+				mount -r -t ${CDROOT_TYPE} ${x} ${mntdir} &>/dev/null
 				if [ "$?" = '0' ]
 				then
 					# Check for the media

generic/linuxrc

@@ -45,6 +45,7 @@ REAL_ROOT=''
 FAKE_ROOT=''
 REAL_ROOTFLAGS=''
 CRYPT_SILENT=0
+CDROOT_TYPE='iso9660'
 for x in ${CMDLINE}
 do
 	case "${x}" in
@@ -71,6 +72,9 @@ do
 			CDROOT=1
 			CDROOT_DEV=`parse_opt "${x}"`
 		;;
+		cdroot_type\=*)
+			CDROOT_TYPE=`parse_opt "${x}"`
+		;;
 		# Start livecd loop, looptype options
 		loop\=*)
 			LOOP=`parse_opt "${x}"`