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

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 aa739daf1bb956ff2ba66ff2efcc4d7c609b2bd4..bfb7dbd1f2b9d4eb8db1e856914e249828e94c6f 100644 (file)
--- 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 bdf62f9adcf9ae2e00446eaec46283ca4c5d0413..3b41076d21671acd7a83a7ecc56eb55f2c30e76a 100755 (executable)
--- 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.