From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Tue, 12 Sep 2006 21:09:01 +0000 (+0000)
Subject: This is ugly.  I mean, really ugly.  However, it is the only way to support all of... 
X-Git-Tag: v3.4.10.902~314
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66e8e81e986a382206cf533202729ee2c033815d;p=genkernel.git

This is ugly.  I mean, really ugly.  However, it is the only way to support all of the insane ways that people are trying to boot release media.  I really wish we didn't have to support this junk, but a regression really shouldn't happen with our releases.  Anyway, hopefully I can come up with a better solution to this in the future.


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

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index caeeb08..9dfbdb2 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -72,7 +72,8 @@ findcdmount() {
 			if [ -b "${x}" ]
 			then
 				good_msg "Attempting to mount media:- ${x}"
-				mount -r -t iso9660,vfat ${x} ${NEW_ROOT}/mnt/cdrom > /dev/null 2>&1
+				mount -r -t iso9660 ${x} ${NEW_ROOT}/mnt/cdrom \
+					> /dev/null 2>&1
 				if [ "$?" = '0' ]
 				then
 					# Check for a LiveCD
@@ -84,6 +85,18 @@ findcdmount() {
 						umount ${NEW_ROOT}/mnt/cdrom
 					fi
 				fi
+				mount -r -t auto ${x} ${NEW_ROOT}/mnt/cdrom \
+					> /dev/null 2>&1
+				if [ "$?" = '0' ]
+				then
+					# Check for a LiveCD
+					if [ -e ${NEW_ROOT}/mnt/cdrom/${SUBDIR}/livecd ]
+					then
+						REAL_ROOT="${x}"
+						break
+					else
+						umount ${NEW_ROOT}/mnt/cdrom
+					fi
 			fi
 		done
 		if [ "${REAL_ROOT}" != '' ]