fixes

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

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 14eba4ed65481c8315a41fe545b974e3d2c762b4..ab80dfa4afaed1d2d92342771d44d052d0daa5e8 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -35,8 +35,9 @@ modules_scan() {
 findcdmount() {
        if [ "$#" -gt "1" ]
        then
-               for x in "$*"
+               for x in $*
                do
+                       echo -e "${HILITE}---- Attempting to mount CD -- ${x}${NORMAL}"
                        mount -t iso9660 -r ${x} /newroot/mnt/cdrom > /dev/null 2>&1
                        if [ "$?" = "0" ]
                        then

diff --git a/generic/linuxrc b/generic/linuxrc
index 03ce3cf3d8140e3980cfa622f4b46b784f78c39f..d4c2ac21733271a8b0df7862a12980f87f0e9743 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -74,7 +74,7 @@ mkdir /newroot
 if [ "${CDROOT}" -eq "1" ]
 then
        mount -t tmpfs tmpfs /newroot
-       mkdir /newroot/dev /newroot/mnt /newroot/mnt/cdrom /newrot/mnt/loop /newroot/tmp/.initrd /newroot/mnt/gentoo
+       mkdir /newroot/dev /newroot/mnt /newroot/mnt/cdrom /newroot/mnt/loop /newroot/tmp/.initrd /newroot/mnt/gentoo
        [ ! -e /newroot/dev/.devfsd ] && mount -t devfs devfs /newroot/dev
        devfsd /newroot/dev
        sleep 1
@@ -88,6 +88,10 @@ then
 
        if [ "${REAL_ROOT}" = "" ]
        then
+               echo "Dropping to shell so you can fix your shit"
+               exec /bin/ash
+
+               # Undo stuff            
                kill_devfsd
                sleep 1
                umount /newroot/dev/