Chameleon

Chameleon Commit Details

Date:2011-07-03 20:59:17 (12 years 9 months ago)
Author:Evan Lojewski
Commit:1097
Parents: 1096
Message:Add an ugly hack for lion. Fix a few kernelcache bugs.
Changes:
M/trunk/i386/boot2/boot.c

File differences

trunk/i386/boot2/boot.c
376376
377377
378378
379
379
380380
381381
382382
......
485485
486486
487487
488
489
488
489
490
490491
491
492
493
494
492495
493496
494497
......
566569
567570
568571
569
572
570573
571574
572
575
573576
574577
575578
bool tryresume;
bool tryresumedefault;
bool forceresume;
bool usecache;
bool usecache = false; //true;
// additional variable for testing alternate kernel image locations on boot helper partitions.
char bootFileSpec[512];
HibernateBoot((char *)val);
break;
}
if(getBoolForKey(kUseKernelCache, &usecache, &bootInfo->bootConfig) && usecache) {
getBoolForKey(kUseKernelCache, &usecache, &bootInfo->bootConfig);
if(usecache) {
if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) {
strlcpy(gBootKernelCacheFile, val, len+1);
//ugly hack. FIX THIS
if(strcmp(val, "\\kernelcache") == 0) strlcpy(gBootKernelCacheFile, "kernelcache", sizeof("kernelcache"));
else strlcpy(gBootKernelCacheFile, val, len+1);
}
else {
//Lion
trycache = 0;
break;
}
if (kerneltime > exttime) {
if (ret == 0 && kerneltime > exttime) {
exttime = kerneltime;
}
if (cachetime != (exttime + 1)) {
if (ret == 0 && cachetime != (exttime + 1)) {
trycache = 0;
break;
}

Archive Download the corresponding diff file

Revision: 1097