From 897b236d540f7cf897fbb87bf1b32751e1d45ba4 Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 25 May 2006 18:52:02 +0000
Subject: [PATCH] Fix an error in setup_unionfs and add in some debug support
 to figure out why/where this initramfs is stopping.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@393 67a159dc-881f-0410-a524-ba9dfbe2cb84
---
 generic/initrd.scripts | 3 ++-
 generic/linuxrc        | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 8b3dc89..ea03023 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -645,7 +645,8 @@ setup_unionfs() {
 		ret=$?
 		if [ "${ret}" -ne 0 ]
 		then 
-			die "Can't setup union ${UNION} in  directory!"
+			bad_msg "Can't setup union ${UNION} in directory!"
+			USE_UNIONFS_NORMAL=0
 		fi
 	else
 		USE_UNIONFS_NORMAL=0
diff --git a/generic/linuxrc b/generic/linuxrc
index 80e9e02..d62b5e1 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -238,15 +238,18 @@ then
 	then
 		good_msg "Making tmpfs for ${NEW_ROOT}"
 		mount -t tmpfs tmpfs ${NEW_ROOT}
+		echo "DEBUG: tmpfs mounted"
 	fi
 	
 	for i in dev mnt mnt/cdrom mnt/livecd tmp tmp/.initrd mnt/gentoo sys
 	do
 		mkdir -p ${NEW_ROOT}/$i
 		chmod 755 ${NEW_ROOT}/$i
+		echo "DEBUG: mkdir $i"
 	done
 	cp /dev/null ${NEW_ROOT}/dev
 	cp /dev/console ${NEW_ROOT}/dev
+	echo "DEBUG: copying null/console"
 
 	# For SGI LiveCDs ...
 	if [ "${LOOPTYPE}" = "sgimips" ]
@@ -260,6 +263,7 @@ then
 	if [ -e /dev/tty1 ]
 	then
 		cp /dev/tty1 ${NEW_ROOT}/dev
+		echo "DEBUG: copying tty1 for splash"
 	fi
 
 	if [ "${REAL_ROOT}" != "/dev/nfs" ] && [ "${LOOPTYPE}" != "sgimips" ]
-- 
2.26.2