Chameleon

Chameleon Commit Details

Date:2011-07-25 11:33:12 (8 years 6 months ago)
Author:Azimutz
Commit:1223
Parents: 1222
Message:Sync with trunk (r1221).
Changes:
M/branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
M/branches/azimutz/trunkGraphicsEnablerModules/package/Resources/Russian.lproj/Localizable.strings
M/branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c
M/branches/azimutz/trunkGraphicsEnablerModules

File differences

branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c
746746
747747
748748
749
750
749
750
751
752
751753
752
754
753755
754756
755757
756
757758
758759
759760
if (length == -1) return -1;
#if 0 /** remove this check. **/
if (strcmp(XMLCastString(XMLGetProperty(moduleDict, kPropOSBundleRequired)), "Safe Boot") == 0)
if (!(gBootMode & kBootModeSafe) &&
XMLGetProperty(moduleDict, kPropOSBundleRequired) &&
strcmp(XMLCastString(XMLGetProperty(moduleDict, kPropOSBundleRequired)), "Safe Boot") == 0)
{
// Don't load Safe Boot kexts. NOTE: -x should be check too.
// Don't load Safe Boot kexts if -x not specified.
XMLFreeTag(moduleDict);
return -2;
}
#endif
tmpModule = malloc(sizeof(Module));
if (tmpModule == 0)
branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
604604
605605
606606
607
608
609
610
611
612
613
614
607
615608
616609
617610
verbose("Kernel cache did not load %s\n ", bootFile);
}
if (checkOSVersion("10.7"))
{
bootFile = gBootKernelCacheFile;
}
else
{
sprintf(bootFile, "/%s", bootInfo->bootFile);
}
bootFile = bootInfo->bootFile;
// Try to load kernel image from alternate locations on boot helper partitions.
sprintf(bootFileSpec, "com.apple.boot.P%s", bootFile);

Archive Download the corresponding diff file

Revision: 1223