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

diff --git a/ChangeLog b/ChangeLog
index 445503417edc43ac9f908da4806ee0dfdfeca7ee..597475ad01bc2be261f7cae1f4d79666b9af8e8f 100644 (file)
--- 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 f6763e550077d7d2a0d6903551be9bf75cdf55d2..ede68dcc153053b1852d0a3771ce6feb401803de 100644 (file)
--- 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 b1debd724fa246bfa294de519f72fb3590306dac..f6a8d419dd2b468ed50975f99645eabae22110ae 100644 (file)
--- 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 8d6b9d6f1f21ef713ffd4be450993cb80e6c31e0..888f6bd3308e4fe7e7514e875291bc7a788b1a4d 100644 (file)
--- 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