From: Tim Yamin <plasmaroo@gentoo.org>
Date: Thu, 14 Jul 2005 21:11:45 +0000 (+0000)
Subject: Fix bug #80617.
X-Git-Tag: v3.4.10.902~490
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24de121078644de9c5029546f7b7f461b1c95227;p=genkernel.git

Fix bug #80617.


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

diff --git a/generic/linuxrc b/generic/linuxrc
index a6861ee..2f16cce 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -44,6 +44,7 @@ quiet_kmsg
 
 CMDLINE="`cat /proc/cmdline`"
 # Scan CMDLINE for any specified real_root= or cdroot arguments
+REAL_ROOT=''
 for x in ${CMDLINE}
 do
   case "${x}" in
@@ -60,12 +61,10 @@ do
       # Livecd options
       cdroot)
 	  CDROOT=1
-	  REAL_ROOT=''
 	  ;;
       cdroot\=*)
 	  CDROOT=1
 	  CDROOT_DEV=`parse_opt "${x}"`
-	  REAL_ROOT=''
 	  ;;
 
       # Start livecd loop and looptype options
@@ -149,6 +148,14 @@ do
       part\=*)
           MDPART=`parse_opt "${x}"`
           ;;
+
+      # NFS
+      ip\=*)
+          IP=`parse_opt "${x}"`
+          ;;
+      nfsroot\=*)
+          NFSROOT=`parse_opt "${x}"`
+          ;;
   esac
 done
 
@@ -220,7 +227,7 @@ then
 	cp /dev/tty1 ${NEW_ROOT}/dev
 	sdelay
 
-	bootstrapCD
+	[ "${REAL_ROOT}"="/dev/nfs" ] || bootstrapCD
 	
 	if [ "${REAL_ROOT}" = '' ]
 	then
@@ -325,9 +332,9 @@ do
 	done
 
 
-	if [ "${CDROOT}" -eq '1' -a "${got_good_root}" = '1' ]
+	if [ "${CDROOT}" -eq '1' -a "${got_good_root}" = '1' -a "${REAL_ROOT}" != "/dev/nfs" ]
 	then
-		# cdrom device already mounted no further checks necessary
+		# CD already mounted; no further checks necessary
 		break
 	else
 		good_msg "Mounting root..."