Chameleon Commit Details - 1131 - Chameleon open source boot loader project.

Date:

2011-07-06 15:16:06 (12 years 9 months ago)

Author:

Evan Lojewski

Commit:

1131

Parents:

1130

Message:

Allow overrides for kMKextCacheKey, kKernelCacheKey

Changes:

M	/trunk/i386/boot2/boot.c
M	/trunk/i386/boot2/options.c
M	/trunk/i386/libsaio/stringTable.c

File differences

-502
503 503
504 504
505 
505
506 506
507 507
508 508
+      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;␊
␊
       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;␊
 ␊

-491
492 492
493 493
494 
494
495 495
496 496
497 497
+        ␊
␉␉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--;␊
         ␊
 ␉␉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--;␊

-1322
1323 1323
1324 1324
1325 
1325
1326 1326
1327 1327
1328 1328
+       }␊
␉}␊
␊
␉if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->chameleonConfig ) )␊
␉if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->bootConfig ) )␊
␉{␊
␉␉strlcpy(gMKextName, val, cnt + 1);␊
␉}␊
        }␊
 ␉}␊
 ␊
-␉if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->chameleonConfig ) )␊
+␉if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->bootConfig ) )␊
 ␉{␊
 ␉␉strlcpy(gMKextName, val, cnt + 1);␊
 ␉}␊