Chameleon

Chameleon Commit Details

Date:2011-07-06 14:50:16 (3 years 5 months ago)
Author:Evan Lojewski
Commit:1129
Parents: 1128
Message:Change options.o so that it reloads the system config as well. Also change it so that it uses that config for variables (NOTE: if the calue exists in chameleonConfig, it's used instead.
Changes:
M/trunk/i386/boot2/options.c

File differences

trunk/i386/boot2/options.c
11841184
11851185
11861186
1187
1187
11881188
11891189
11901190
......
11991199
12001200
12011201
1202
1202
12031203
12041204
12051205
......
12141214
12151215
12161216
1217
1217
12181218
12191219
12201220
// Load com.apple.Boot.plist from the selected volume
// and use its contents to override default bootConfig.
// loadSystemConfig(&bootInfo->bootConfig);
loadSystemConfig(&bootInfo->bootConfig);
loadChameleonConfig(&bootInfo->chameleonConfig);
// Use the kernel name specified by the user, or fetch the name
strcpy( bootInfo->bootFile, kernel );
gOverrideKernel = true;
} else {
if ( getValueForKey( kKernelNameKey, &val, &cnt, &bootInfo->chameleonConfig ) ) {
if ( getValueForKey( kKernelNameKey, &val, &cnt, &bootInfo->bootConfig ) ) {
strlcpy( bootInfo->bootFile, val, cnt+1 );
if (strcmp( bootInfo->bootFile, kDefaultKernel ) != 0) {
gOverrideKernel = true;
// Get config table kernel flags, if not ignored.
if (getValueForBootKey(cp, kIgnoreBootFileFlag, &val, &cnt) ||
!getValueForKey( kKernelFlagsKey, &val, &cnt, &bootInfo->chameleonConfig )) {
!getValueForKey( kKernelFlagsKey, &val, &cnt, &bootInfo->bootConfig )) {
val = "";
cnt = 0;
}

Archive Download the corresponding diff file

Revision: 1129