Chameleon

Chameleon Commit Details

Date:2011-07-06 15:12:09 (12 years 8 months ago)
Author:Evan Lojewski
Commit:1130
Parents: 1129
Message:Add missing boot key from com.apple.Boot.plist
Changes:
M/trunk/i386/boot2/boot.c
M/trunk/i386/boot2/boot.h
M/trunk/i386/libsaio/stringTable.c

File differences

trunk/i386/libsaio/stringTable.c
501501
502502
503503
504
505
504506
505507
506508
{
override = true;
// NOTE: Values are defined by apple as being in com.apple.Boot.plist
// kMKextCacheKey, kKernelArchKey, kMKextCacheKey, kKernelCacheKey, kKernelNameKey, kKernelFlagsKey
if (ret && (strcmp(key, kKernelNameKey) == 0) && (strcmp(overrideVal, "mach_kernel") == 0))
override = false;
trunk/i386/boot2/boot.c
433433
434434
435435
436
437
438
439
440
441
442
436443
437444
438445
archCpuType = CPU_TYPE_I386;
}
}
if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {
if (strncmp(val, "i386", 4) == 0) {
archCpuType = CPU_TYPE_I386;
}
}
//archCpuType = CPU_TYPE_I386;
// Notify moduals that we are attempting to boot
trunk/i386/boot2/boot.h
4949
5050
5151
52
5253
5354
5455
#define kTextModeKey"Text Mode"
#define kQuietBootKey"Quiet Boot"
#define kKernelFlagsKey"Kernel Flags"
#define kKernelArchKey "Kernel Architecture"
#define karch"arch"/* boot.c */
#define kProductVersion"ProductVersion"/* boot.c */
#define kMKextCacheKey"MKext Cache"

Archive Download the corresponding diff file

Revision: 1130