Revert "Fix docache (bug #397309)"

This reverts commit b7a1a38eccbad5deed35e179b371799fa6a7f19c.

Conflicts:

	ChangeLog

3 files changed, 4 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c48001..87aae87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,10 +9,6 @@
   Fail hard on LUKS inclusion error (bug #409277), advise about
   sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/
 
-  17 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
-  defaults/linuxrc:
-  Fix docache (bug #397309)
-
   25 Feb 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
   arch/x86_64/modules_load, defaults/modules_load:
   Make sure the sha256 module makes it into the initramfs (bug #405495).
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c476d77..89629e9 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -184,11 +184,12 @@ cache_cd_contents() {
 			cp -a ${CDROOT_PATH}/${LOOP} ${NEW_ROOT}/mnt/${LOOP}
 			if [ $? -ne 0 ]
 			then
-				warn_msg "Failed to cache the loop file! Lack of RAM?"
-				rm -rf ${NEW_ROOT}/mnt/${LOOP} 2>/dev/null
+				bad_msg "Failed to cache the loop file! Lack of space?"
 				rm -rf ${NEW_ROOT}/mnt/livecd.* 2>/dev/null
 				rm -rf ${NEW_ROOT}/mnt/image.* 2>/dev/null
 				rm -rf ${NEW_ROOT}/mnt/zisofs 2>/dev/null
+			else
+				LOOPEXT='../'
 			fi
 		fi
 	fi
diff --git a/defaults/linuxrc b/defaults/linuxrc
index d3b5aa5..6bdaea1 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -561,19 +561,7 @@ then
 		then
 			if [ "${USE_AUFS_NORMAL}" != '1' ]; then
 				good_msg 'Mounting squashfs filesystem'
-				_CACHED_SQUASHFS_PATH="${NEW_ROOT}/mnt/${LOOP}"
-				_squashfs_path="${CDROOT_PATH}/${LOOPEXT}${LOOP}"  # Default to uncached
-				# Upgrade to cached version if possible
-				[ "${DO_cache}" -a -f "${_CACHED_SQUASHFS_PATH}" ] \
-						&& _squashfs_path=${_CACHED_SQUASHFS_PATH}
-				mount -t squashfs -o loop,ro "${_squashfs_path}" "${NEW_ROOT}/mnt/livecd" || {
-					bad_msg "Squashfs filesystem could not be mounted, dropping into shell."
-					if [ -e /proc/filesystems ]; then
-						fgrep -q squashfs /proc/filesystems || \
-							bad_msg "HINT: Your kernel does not know filesystem \"squashfs\"."
-					fi
-					do_rundebugshell
-				}
+				mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
 			else
 				good_msg 'Mounting squashfs & aufs filesystems'
 				setup_squashfs_aufs