Index: genkernel/trunk/generic/initrd.defaults
===================================================================
--- genkernel/trunk/generic/initrd.defaults	(revision 578)
+++ genkernel/trunk/generic/initrd.defaults	(working copy)
@@ -76,6 +76,7 @@
 CDROOT_TYPE='iso9660'
 NEW_ROOT="/newroot"
 CONSOLE="/dev/console"
+CRYPT_SILENT=0
 
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
Index: genkernel/trunk/generic/initrd.scripts
===================================================================
--- genkernel/trunk/generic/initrd.scripts	(revision 578)
+++ genkernel/trunk/generic/initrd.scripts	(working copy)
@@ -74,11 +74,16 @@
 	# $2 = recognition file
 	# $3 = variable to have the device path
 	# $4 = directory before /mnt, like NEW_ROOT
+        # $5 = mount type for devices
 	# args remaining are possible devices 
 
-	local media=$1 recon=$2 vrbl=$3
+	(( $# < 6 )) && \
+                bad_msg "Bad invocation of function findmediamount, please file a bug \
+                report with this message" && exit 1
+
+	local media=$1 recon=$2 vrbl=$3 mnttype=$5
 	local mntdir="${4}/mnt/${media}"
-	shift 4
+	shift 5
 
 	good_msg "Looking for the ${media}" ${CRYPT_SILENT}
 
@@ -94,12 +99,8 @@
 			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
-				mount -r -t ${CDROOT_TYPE} ${x} ${mntdir} &>/dev/null
+				mount -r -t ${mnttype} ${x} ${mntdir} >/dev/null 2>&1
+				
 				if [ "$?" = '0' ]
 				then
 					# Check for the media
@@ -143,7 +144,7 @@
 	# a bunch of extra devices
 	[ -n "${CDROOT_DEV}" ] && DEVICES="${CDROOT_DEV}"
 
-	findmediamount "cdrom" "${SUBDIR}/livecd" "REAL_ROOT" "${NEW_ROOT}" ${DEVICES}
+	findmediamount "cdrom" "${SUBDIR}/livecd" "REAL_ROOT" "${NEW_ROOT}" "${CDROOT_TYPE}" ${DEVICES}
 }
 
 bootstrapKey() {
@@ -151,7 +152,7 @@
 	local KEYDEVS=`devicelist`
 	eval local keyloc='"${CRYPT_'${1}'_KEY}"'
 
-	findmediamount "key" "${keyloc}" "CRYPT_${1}_KEYDEV" "" ${KEYDEVS}
+	findmediamount "key" "${keyloc}" "CRYPT_${1}_KEYDEV" "" "auto" ${KEYDEVS}
 }
 
 cache_cd_contents() {
Index: genkernel/trunk/generic/linuxrc
===================================================================
--- genkernel/trunk/generic/linuxrc	(revision 578)
+++ genkernel/trunk/generic/linuxrc	(working copy)
@@ -44,7 +44,6 @@
 REAL_ROOT=''
 FAKE_ROOT=''
 REAL_ROOTFLAGS=''
-CRYPT_SILENT=0
 for x in ${CMDLINE}
 do
 	case "${x}" in