From 07397c610098d7eeabc1b47e06258daa79b6a406 Mon Sep 17 00:00:00 2001
From: Andrew Gaffney <agaffney@gentoo.org>
Date: Fri, 28 Dec 2007 03:35:36 +0000
Subject: [PATCH] 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               | 4 ++++
 generic/initrd.defaults | 1 +
 generic/initrd.scripts  | 7 +++----
 generic/linuxrc         | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4455034..597475a 100644
--- a/ChangeLog
+++ b/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
diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index f6763e5..ede68dc 100644
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -73,6 +73,7 @@ fi
 REAL_ROOT=''
 CDROOT=0
 CDROOT_DEV=''
+CDROOT_TYPE='iso9660'
 NEW_ROOT="/newroot"
 CONSOLE="/dev/console"
 
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index b1debd7..f6a8d41 100644
--- a/generic/initrd.scripts
+++ b/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}
 }
diff --git a/generic/linuxrc b/generic/linuxrc
index 8d6b9d6..888f6bd 100644
--- a/generic/linuxrc
+++ b/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
-- 
2.26.2