>> 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

generic/initrd.scripts

@@ -45,21 +45,15 @@ findcdmount() {
 			mount -r ${x} /newroot/mnt/cdrom > /dev/null 2>&1
 
 			if [ "$?" = '0' ]
+			then
+				# Check for a LiveCD
+				if [ -e /newroot/mnt/cdrom/gentoo ]
 				then
 					REAL_ROOT="${x}"
 					break
-
+				else
-				## FIXME: I need a proper identifier present on all LiveCDs to work across
+					umount /newroot/mnt/cdrom
-				##        all architectures.
+				fi
-
-#				# Check for a LiveCD
-#				if [ -e /newroot/mnt/cdrom/.gentoo_LiveCD ]
-#				then
-#					REAL_ROOT="${x}"
-#					break
-#				else
-#					umount /newroot/mnt/cdrom
-#				fi
 			fi
 		done
 		if [ "${REAL_ROOT}" != "" ]

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.