*** init	2010-01-02 16:10:21.000000000 +0100
--- init	2010-01-02 16:21:09.000000000 +0100
***************
*** 338,347 ****
  		[ ! -e "${NEW_ROOT}/dev/tty1" ] && mknod "${NEW_ROOT}/dev/tty1" c 4 1
  	fi
  
! 	if [ "${REAL_ROOT}" != "/dev/nfs" ] && [ "${LOOPTYPE}" != "sgimips" ]
! 	then
! 		bootstrapCD
! 	fi
  
  	if [ "${REAL_ROOT}" = '' ]
  	then
--- 338,347 ----
  		[ ! -e "${NEW_ROOT}/dev/tty1" ] && mknod "${NEW_ROOT}/dev/tty1" c 4 1
  	fi
  
! 	#if [ "${REAL_ROOT}" != "/dev/nfs" ] && [ "${LOOPTYPE}" != "sgimips" ]
! 	#then
! 	#	bootstrapCD
! 	#fi
  
  	if [ "${REAL_ROOT}" = '' ]
  	then
***************
*** 427,432 ****
--- 427,433 ----
  			bad_msg "Block device ${REAL_ROOT} is not a valid root device..."
  			REAL_ROOT=""
  			got_good_root=0
+ 			got_good_root=1
  		fi
  	done
  
***************
*** 489,495 ****
  	[ -z "${LOOP}" ] && find_loop
  	[ -z "${LOOPTYPE}" ] && find_looptype
  
! 	cache_cd_contents
  
  	# If encrypted, find key and mount, otherwise mount as usual
  	if [ -n "${CRYPT_ROOT}" ]
--- 490,496 ----
  	[ -z "${LOOP}" ] && find_loop
  	[ -z "${LOOPTYPE}" ] && find_looptype
  
! 	#cache_cd_contents
  
  	# If encrypted, find key and mount, otherwise mount as usual
  	if [ -n "${CRYPT_ROOT}" ]
***************
*** 525,531 ****
  		elif [ "${LOOPTYPE}" = 'squashfs' ]
  		then
  			good_msg 'Mounting squashfs filesystem'
! 			mount -t squashfs -o loop,ro "${NEW_ROOT}/mnt/cdrom/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
  			test_success 'Mount filesystem'
  			FS_LOCATION='mnt/livecd'
  		elif [ "${LOOPTYPE}" = 'gcloop' ]
--- 526,533 ----
  		elif [ "${LOOPTYPE}" = 'squashfs' ]
  		then
  			good_msg 'Mounting squashfs filesystem'
! 			#mount -t squashfs -o loop,ro "${NEW_ROOT}/mnt/cdrom/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
! 			mount -t squashfs -o loop,ro "/mnt/cdrom/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
  			test_success 'Mount filesystem'
  			FS_LOCATION='mnt/livecd'
  		elif [ "${LOOPTYPE}" = 'gcloop' ]