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

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

diff --git a/ChangeLog b/ChangeLog
index 4847914932149dfa1986e7a47518e35bad288932..445503417edc43ac9f908da4806ee0dfdfeca7ee 100644 (file)
--- a/ChangeLog
+++ b/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
 

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

diff --git a/generic/linuxrc b/generic/linuxrc
index 7cccb57b8a436071931149c771d0b5b3c0c746bd..8d6b9d6f1f21ef713ffd4be450993cb80e6c31e0 100644 (file)
--- a/generic/linuxrc
+++ b/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}"`