From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 24 May 2006 22:11:48 +0000 (+0000)
Subject: Add in image.squashfs as a squashfs loop, since it is now the default in catalyst... 
X-Git-Tag: v3.4.10.902~361
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4e5fe341997f614c109bd0bd6b39cd0e1ef9f8b;p=genkernel.git

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
---

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index bc83c69..8a68e09 100644
--- a/generic/initrd.scripts
+++ b/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 ]
diff --git a/generic/linuxrc b/generic/linuxrc
index 2fc586c..80e9e02 100644
--- a/generic/linuxrc
+++ b/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'