From: Tim Yamin <plasmaroo@gentoo.org>
Date: Thu, 3 Mar 2005 22:34:04 +0000 (+0000)
Subject: >> 3.1.1c. Add LiveCD detection to skip mountable but non-LiveCD media; requires... 
X-Git-Tag: v3.4.10.902~574
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fe7ee2175ed48a9b404cfa5b3b89ae338149abe;p=genkernel.git

>> 3.1.1c. Add LiveCD detection to skip mountable but non-LiveCD media; requires Catalyst 1.1.6.


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

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index aa739da..bfb7dbd 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -46,20 +46,14 @@ findcdmount() {
 
 			if [ "$?" = '0' ]
 			then
-				REAL_ROOT="${x}"
-				break
-
-				## FIXME: I need a proper identifier present on all LiveCDs to work across
-				##        all architectures.
-
-#				# Check for a LiveCD
-#				if [ -e /newroot/mnt/cdrom/.gentoo_LiveCD ]
-#				then
-#					REAL_ROOT="${x}"
-#					break
-#				else
-#					umount /newroot/mnt/cdrom
-#				fi
+				# Check for a LiveCD
+				if [ -e /newroot/mnt/cdrom/gentoo ]
+				then
+					REAL_ROOT="${x}"
+					break
+				else
+					umount /newroot/mnt/cdrom
+				fi
 			fi
 		done
 		if [ "${REAL_ROOT}" != "" ]
diff --git a/genkernel b/genkernel
index bdf62f9..3b41076 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.1.1b'
+GK_V='3.1.1c'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.