From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Tue, 12 Sep 2006 13:26:19 +0000 (+0000)
Subject: iso9660 -> auto, and added support for checking SUBDIR for the livecd file.  This... 
X-Git-Tag: v3.4.10.902~321
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4fc7d72f9613ee1e62efd99bbaa4f30b2a74ab2;p=genkernel.git

iso9660 -> auto, and added support for checking SUBDIR for the livecd file.  This is for bug #147186.


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

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index a7fca77..c864464 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -1,6 +1,7 @@
 #!/bin/ash
 
 . /etc/initrd.defaults
+
 backup() {
 	echo -ne "\033[0G\033[0K"
 }
@@ -70,12 +71,12 @@ findcdmount() {
 			# Check for a block device to mount
 			if [ -b "${x}" ]
 			then
-				good_msg "Attempting to mount CD:- ${x}"
-				mount -r -t iso9660 ${x} ${NEW_ROOT}/mnt/cdrom > /dev/null 2>&1
+				good_msg "Attempting to mount media:- ${x}"
+				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/livecd ]
+					if [ -e ${NEW_ROOT}/mnt/cdrom/${SUBDIR}/livecd ]
 					then
 						REAL_ROOT="${x}"
 						break
@@ -87,7 +88,7 @@ findcdmount() {
 		done
 		if [ "${REAL_ROOT}" != '' ]
 		then
-			good_msg "CD medium found on ${x}"
+			good_msg "Media found on ${x}"
 		fi
 	fi
 }