Change the check for /livecd when booting a CD to check for a file called livecd...

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

diff --git a/ChangeLog b/ChangeLog
index 13ab949e52bf1025691ab6b5794ef03a09caf58c..168ad699cfed2338a2ef205eec967ae0cbe18a13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts:
+  Change the check for /livecd when booting a CD to check for a file called
+  livecd, rather than just the existence of /livecd, which should keep it from
+  finding disks with a /livecd directory.
+
   21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_package.sh:
   Added a patch from Andrew Gaffney <agaffney@gentoo.org> from bug #174188 to
   fix a problem with the System.map file copying that was previously

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 209ab7d41556db8db504e9774b4945475218be4d..0fd14e87314ccbaae2e34e496cfe80d2236bb7e6 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -83,7 +83,7 @@ findcdmount() {
                                if [ "$?" = '0' ]
                                then
                                        # Check for a LiveCD
-                                       if [ -e ${NEW_ROOT}/mnt/cdrom/${SUBDIR}/livecd ]
+                                       if [ -f ${NEW_ROOT}/mnt/cdrom/${SUBDIR}/livecd ]
                                        then
                                                REAL_ROOT="${x}"
                                                break