don't scan a bunch of extra devices when CDROOT_DEV is defined

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

ChangeLog

@@ -2,6 +2,10 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.defaults,
+  generic/initrd.scripts, generic/linuxrc:
+  don't scan a bunch of extra devices when CDROOT_DEV is defined
+
   28 Dec 2007; Andrew Gaffney <agaffney@gentoo.org> generic/initrd.scripts,
   generic/linuxrc:
   add new cdroot_type=foo kernel commandline parameter to override -t iso9660

generic/initrd.defaults

@@ -73,6 +73,7 @@ fi
 REAL_ROOT=''
 CDROOT=0
 CDROOT_DEV=''
+CDROOT_TYPE='iso9660'
 NEW_ROOT="/newroot"
 CONSOLE="/dev/console"
 

generic/initrd.scripts

@@ -138,11 +138,10 @@ devicelist(){
 }
 
 bootstrapCD() {
-	
 	local DEVICES=`devicelist`
-	# The device was specified on the command line.  Shold we even be doing a
-	# scan at this point?  I think not.
-	[ -n "${CDROOT_DEV}" ] && DEVICES="$DEVICES ${CDROOT_DEV}"
+	# The device was specified on the command line, so there's no need to scan
+	# a bunch of extra devices
+	[ -n "${CDROOT_DEV}" ] && DEVICES="${CDROOT_DEV}"
 
 	findmediamount "cdrom" "${SUBDIR}/livecd" "REAL_ROOT" "${NEW_ROOT}" ${DEVICES}
 }

generic/linuxrc

@@ -45,7 +45,6 @@ REAL_ROOT=''
 FAKE_ROOT=''
 REAL_ROOTFLAGS=''
 CRYPT_SILENT=0
-CDROOT_TYPE='iso9660'
 for x in ${CMDLINE}
 do
 	case "${x}" in