Index: genkernel/trunk/generic/initrd.scripts
===================================================================
--- genkernel/trunk/generic/initrd.scripts	(revision 578)
+++ genkernel/trunk/generic/initrd.scripts	(working copy)
@@ -94,12 +94,12 @@
 			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
+				if [ -n "${CDROOT_DEV}" -a \( ${media}="cdrom" \) ]; then
+					mount -r -t ${CDROOT_TYPE} ${x} ${mntdir} >/dev/null 2>&1
+				else
+					mount -r -t auto ${x} ${mntdir} >/dev/null 2>&1
+				fi		
+
 				if [ "$?" = '0' ]
 				then
 					# Check for the media