Revert "Fix docache (bug #397309)"
authorSebastian Pipping <sebastian@pipping.org>
Sat, 12 May 2012 15:46:11 +0000 (17:46 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Sat, 12 May 2012 15:46:11 +0000 (17:46 +0200)
This reverts commit b7a1a38eccbad5deed35e179b371799fa6a7f19c.

Conflicts:

ChangeLog

ChangeLog
defaults/initrd.scripts
defaults/linuxrc

index 2c48001dbd841b6e5eb11e39c19a6623e49b792b..87aae87833cb5d5a6c04dd3624f80535d06e5e7d 100644 (file)
--- 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).
index c476d776531b250aa39bbfa238c3864b9db42bdf..89629e9f1b631afb74f9a013006af31570db4e2c 100755 (executable)
@@ -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
index d3b5aa57f670b5efa569b3a02316475706100bd6..6bdaea1b20c86237ce7c4150287499247fe37c33 100755 (executable)
@@ -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