[gentoo-commits] proj/genkernel:master commit in: /, defaults/

["Sebastian Pipping" <sping@gentoo.org>]

commit:     4ed04331a506926fde85d8a375e94039e368bdb7
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Mar 16 22:40:14 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 23:08:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=4ed04331

Drop into debug shell when squashfs could not be mounted

---
 ChangeLog        |    4 ++++
 defaults/linuxrc |    9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d41a6f..c1f376d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 
   16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
   defaults/linuxrc:
+  Drop into debug shell when squashfs could not be mounted
+
+  16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
+  defaults/linuxrc:
   Drop into debug shell when files could not be copied into tmpfs
 
   16 Mar 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 226a903..5932024 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -627,7 +627,14 @@ then
 		then
 			if [ "${USE_AUFS_NORMAL}" != '1' ]; then
 				good_msg 'Mounting squashfs filesystem'
-				mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${NEW_ROOT}/mnt/livecd"
+				mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${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
+				}
 			else
 				good_msg 'Mounting squashfs & aufs filesystems'
 				setup_squashfs_aufs