Add in image.squashfs as a squashfs loop, since it is now the default in catalyst. Also, added a nice TODO about docache and size restrictions into cache_cd_contents.

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

generic/initrd.scripts

@@ -99,6 +99,9 @@ cache_cd_contents() {
 		check_loop
 		if [ "${DO_cache}" ]
 		then
+			# TODO: Check the size of the image versus the size of our tmpfs
+			# along with the amount of available RAM and increase tmpfs size
+			# if necessary.
 			good_msg "Copying loop file for caching..."
 			cp -a ${NEW_ROOT}/mnt/cdrom/${LOOP} ${NEW_ROOT}/mnt/${LOOP}
 			if [ $? -ne 0 ]

generic/linuxrc

@@ -424,6 +424,9 @@ then
 			LOOPTYPE='zisofs'
 				elif [ -e "${NEW_ROOT}/mnt/cdrom/livecd.squashfs" ]; then
 			LOOP='/livecd.squashfs'
+			LOOPTYPE='squashfs'
+				elif [ -e "${NEW_ROOT}/mnt/cdrom/image.squashfs" ]; then
+			LOOP='/image.squashfs'
 			LOOPTYPE='squashfs'
 				elif [ -e "${NEW_ROOT}/mnt/cdrom/livecd.gcloop" ]; then
 			LOOP='/livecd.gcloop'
@@ -446,6 +449,8 @@ then
 		elif [ "${LOOP}" = '/livecd.squashfs' ]
 		then
 			LOOPTYPE='squashfs'
+		elif [ "${LOOP}" = '/image.squashfs' ]
+			LOOPTYPE='squashfs'
 		elif [ "${LOOP}" = '/livecd.gcloop' ]
 		then
 			LOOPTYPE='gcloop'