Index: trunk/i386/libsaio/stringTable.c
===================================================================
--- trunk/i386/libsaio/stringTable.c	(revision 1130)
+++ trunk/i386/libsaio/stringTable.c	(revision 1131)
@@ -502,7 +502,7 @@
       override = true;
 
       // NOTE: Values are defined by apple as being in com.apple.Boot.plist
-      //        kMKextCacheKey, kKernelArchKey, kMKextCacheKey, kKernelCacheKey, kKernelNameKey, kKernelFlagsKey
+      //        kHelperRootUUIDKey, kKernelArchKey, kMKextCacheKey, kKernelCacheKey, kKernelNameKey, kKernelFlagsKey
       if (ret && (strcmp(key, kKernelNameKey) == 0) && (strcmp(overrideVal, "mach_kernel") == 0))
         override = false;
 
Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 1130)
+++ trunk/i386/boot2/boot.c	(revision 1131)
@@ -491,7 +491,7 @@
         
 		getBoolForKey(kUseKernelCache, &usecache, &bootInfo->chameleonConfig);
 		if(usecache) {
-			if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->chameleonConfig)) {
+			if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
                 if(val[0] == '\\')
                 {
                     len--;
Index: trunk/i386/boot2/options.c
===================================================================
--- trunk/i386/boot2/options.c	(revision 1130)
+++ trunk/i386/boot2/options.c	(revision 1131)
@@ -1322,7 +1322,7 @@
        }
 	}
 
-	if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->chameleonConfig ) )
+	if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->bootConfig ) )
 	{
 		strlcpy(gMKextName, val, cnt + 1);
 	}