This is ugly. I mean, really ugly. However, it is the only way to support all of...

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 caeeb08844380a15efd5f66da288a898e4a77809..9dfbdb2faedf7bfbfa7c8b60261e6f629b894f40 100644 (file)
--- 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}" != '' ]