Fix an error in setup_unionfs and add in some debug support to figure out why/where...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@393 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 8b3dc896ed254632d821e2d9b7c72ccc0c6eb277..ea03023c3b4f833a821b64a07689c5e1b51a617c 100644 (file)
--- 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 80e9e026a71033a49922003c2bd2e01352b863d2..d62b5e192dfb3dc8ab7f5c2e1d1667e55dc69220 100644 (file)
--- 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" ]