put -t auto back to -t iso9660 for mounting a cdrom. this is for bug 162962

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

diff --git a/ChangeLog b/ChangeLog
index 5562ec5ae86c3da01a90063ace7be06d78bf6bed..4847914932149dfa1986e7a47518e35bad288932 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
+
   27 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> genkernel.8:
   fix description of --kernel-config for bug 194752
 

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index e6649b881fbf95856752182a08ecd10130c18314..68910c05d52df2978fe9aa0eeeaed89b34660d83 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -93,12 +93,12 @@ findmediamount() {
                        if [ -b "${x}" ]
                        then
                                good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT}
-       
-                               if [ -n "${CDROOT_DEV}" -a \( ${media}="cdrom" \) ]; then
-                                       mount -r -t auto ${x} ${NEW_ROOT}/mnt/cdrom >/dev/null 2>&1
+
+                               if [ "${media}" = "cdrom" ]; then
+                                       mount -r -t iso9660 ${x} ${mntdir} &>/dev/null
                                else
-                                       mount -r -t auto ${x} ${mntdir} >/dev/null 2>&1
-                               fi                              
+                                       mount -r -t auto ${x} ${mntdir} &>/dev/null
+                               fi
                                if [ "$?" = '0' ]
                                then
                                        # Check for the media