| 1 |
commit: b0969ed6548be825aba8d1bf2d83ed7b15c3fc03 |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Sat May 12 15:46:11 2012 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 12 15:46:11 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b0969ed6 |
| 7 |
|
| 8 |
Revert "Fix docache (bug #397309)" |
| 9 |
|
| 10 |
This reverts commit b7a1a38eccbad5deed35e179b371799fa6a7f19c. |
| 11 |
|
| 12 |
Conflicts: |
| 13 |
|
| 14 |
ChangeLog |
| 15 |
|
| 16 |
--- |
| 17 |
ChangeLog | 4 ---- |
| 18 |
defaults/initrd.scripts | 5 +++-- |
| 19 |
defaults/linuxrc | 14 +------------- |
| 20 |
3 files changed, 4 insertions(+), 19 deletions(-) |
| 21 |
|
| 22 |
diff --git a/ChangeLog b/ChangeLog |
| 23 |
index 2c48001..87aae87 100644 |
| 24 |
--- a/ChangeLog |
| 25 |
+++ b/ChangeLog |
| 26 |
@@ -9,10 +9,6 @@ |
| 27 |
Fail hard on LUKS inclusion error (bug #409277), advise about |
| 28 |
sys-fs/cryptsetup[static], drop support for cryptsetup binary from /bin/ |
| 29 |
|
| 30 |
- 17 Mar 2012; Sebastian Pipping <sping@g.o> defaults/initrd.scripts, |
| 31 |
- defaults/linuxrc: |
| 32 |
- Fix docache (bug #397309) |
| 33 |
- |
| 34 |
25 Feb 2012; Sebastian Pipping <sping@g.o> arch/x86/modules_load, |
| 35 |
arch/x86_64/modules_load, defaults/modules_load: |
| 36 |
Make sure the sha256 module makes it into the initramfs (bug #405495). |
| 37 |
|
| 38 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 39 |
index c476d77..89629e9 100755 |
| 40 |
--- a/defaults/initrd.scripts |
| 41 |
+++ b/defaults/initrd.scripts |
| 42 |
@@ -184,11 +184,12 @@ cache_cd_contents() { |
| 43 |
cp -a ${CDROOT_PATH}/${LOOP} ${NEW_ROOT}/mnt/${LOOP} |
| 44 |
if [ $? -ne 0 ] |
| 45 |
then |
| 46 |
- warn_msg "Failed to cache the loop file! Lack of RAM?" |
| 47 |
- rm -rf ${NEW_ROOT}/mnt/${LOOP} 2>/dev/null |
| 48 |
+ bad_msg "Failed to cache the loop file! Lack of space?" |
| 49 |
rm -rf ${NEW_ROOT}/mnt/livecd.* 2>/dev/null |
| 50 |
rm -rf ${NEW_ROOT}/mnt/image.* 2>/dev/null |
| 51 |
rm -rf ${NEW_ROOT}/mnt/zisofs 2>/dev/null |
| 52 |
+ else |
| 53 |
+ LOOPEXT='../' |
| 54 |
fi |
| 55 |
fi |
| 56 |
fi |
| 57 |
|
| 58 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
| 59 |
index d3b5aa5..6bdaea1 100755 |
| 60 |
--- a/defaults/linuxrc |
| 61 |
+++ b/defaults/linuxrc |
| 62 |
@@ -561,19 +561,7 @@ then |
| 63 |
then |
| 64 |
if [ "${USE_AUFS_NORMAL}" != '1' ]; then |
| 65 |
good_msg 'Mounting squashfs filesystem' |
| 66 |
- _CACHED_SQUASHFS_PATH="${NEW_ROOT}/mnt/${LOOP}" |
| 67 |
- _squashfs_path="${CDROOT_PATH}/${LOOPEXT}${LOOP}" # Default to uncached |
| 68 |
- # Upgrade to cached version if possible |
| 69 |
- [ "${DO_cache}" -a -f "${_CACHED_SQUASHFS_PATH}" ] \ |
| 70 |
- && _squashfs_path=${_CACHED_SQUASHFS_PATH} |
| 71 |
- mount -t squashfs -o loop,ro "${_squashfs_path}" "${NEW_ROOT}/mnt/livecd" || { |
| 72 |
- bad_msg "Squashfs filesystem could not be mounted, dropping into shell." |
| 73 |
- if [ -e /proc/filesystems ]; then |
| 74 |
- fgrep -q squashfs /proc/filesystems || \ |
| 75 |
- bad_msg "HINT: Your kernel does not know filesystem \"squashfs\"." |
| 76 |
- fi |
| 77 |
- do_rundebugshell |
| 78 |
- } |
| 79 |
+ mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd" |
| 80 |
else |
| 81 |
good_msg 'Mounting squashfs & aufs filesystems' |
| 82 |
setup_squashfs_aufs |
Archives