From: Brad House <brad_mssw@gentoo.org>
Date: Sun, 11 Jan 2004 20:07:05 +0000 (+0000)
Subject: fixes
X-Git-Tag: v3.4.10.902~704
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a3ee9dad5e55b29621aab3c3b5bf32d5fac11e04;p=genkernel.git

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 14eba4e..ab80dfa 100644
--- 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 03ce3cf..d4c2ac2 100644
--- 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/