diff --git a/generic/initrd.scripts b/generic/initrd.scripts index caeeb08..9dfbdb2 100644 --- 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}" != '' ]