Chameleon

Chameleon Commit Details

Date:2010-08-17 13:41:56 (10 years 3 months ago)
Author:Tamás Kosárszky
Commit:376
Parents: 375
Message:Removed obsolete -f option. Use -x for disabling kernel and extensions caches instead.
Changes:
M/trunk/i386/boot2/boot.h
M/trunk/i386/boot2/options.c

File differences

trunk/i386/boot2/boot.h
9999
100100
101101
102
103102
104103
105104
*/
#define kVerboseModeFlag"-v"
#define kSafeModeFlag"-x"
#define kOldSafeModeFlag"-f"
#define kIgnoreBootFileFlag"-F"
#define kSingleUserModeFlag"-s"
#define k32BitModeFlag"-x32"
trunk/i386/boot2/options.c
442442
443443
444444
445
445
446446
447447
448448
......
13051305
13061306
13071307
1308
1309
1310
1311
1308
1309
1310
1311
1312
1313
1314
1315
13121316
1313
1314
1317
1318
1319
1320
13151321
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
13261322
13271323
13281324
gVerboseMode = false;
gBootMode = kBootModeNormal;
*gBootArgsPtr++ = '-';
*gBootArgsPtr++ = 'f';
*gBootArgsPtr++ = 'x';
break;
case BOOT_SINGLEUSER:
strncpy(&argP[cnt], cp, userCnt);
argP[cnt+userCnt] = '\0';
if(!shouldboot)
{
gVerboseMode = getValueForKey( kVerboseModeFlag, &val, &cnt, &bootInfo->bootConfig ) ||
getValueForKey( kSingleUserModeFlag, &val, &cnt, &bootInfo->bootConfig );
if(!shouldboot)
{
gVerboseMode = getValueForKey( kVerboseModeFlag, &val, &cnt, &bootInfo->bootConfig ) ||
getValueForKey( kSingleUserModeFlag, &val, &cnt, &bootInfo->bootConfig );
gBootMode = ( getValueForKey( kSafeModeFlag, &val, &cnt, &bootInfo->bootConfig ) ) ?
kBootModeSafe : kBootModeNormal;
}
gBootMode = ( getValueForKey( kSafeModeFlag, &val, &cnt, &bootInfo->bootConfig ) ) ?
kBootModeSafe : kBootModeNormal;
if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->bootConfig ) )
{
strlcpy(gMKextName, val, cnt + 1);
}
if ( getValueForKey( kOldSafeModeFlag, &val, &cnt, &bootInfo->bootConfig ) ) {
gBootMode = kBootModeSafe;
}
if ( getValueForKey( kMKextCacheKey, &val, &cnt, &bootInfo->bootConfig ) ) {
strlcpy(gMKextName, val, cnt + 1);
}
}
free(configKernelFlags);
free(valueBuffer);

Archive Download the corresponding diff file

Revision: 376