From: Chris Gianelloni Date: Thu, 21 Jun 2007 19:54:54 +0000 (+0000) Subject: Change the check for /livecd when booting a CD to check for a file called livecd... X-Git-Tag: v3.4.10.902~239 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c26beee9535d74f55b5e7c685de872cce19460e;p=genkernel.git 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. 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 13ab949..168ad69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Jun 2007; Chris Gianelloni + 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 gen_package.sh: Added a patch from Andrew Gaffney 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 209ab7d..0fd14e8 100644 --- 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