Chameleon

Chameleon Commit Details

Date:2011-08-06 23:17:55 (9 years 3 months ago)
Author:Azimutz
Commit:1310
Parents: 1309
Message:Sync these two with trunk (r1306).
Changes:
M/branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
M/branches/azimutz/trunkAutoResolution
M/branches/azimutz/trunkAutoResolution/i386/boot2/boot.c
M/branches/azimutz/trunkGraphicsEnablerModules

File differences

branches/azimutz/trunkAutoResolution/i386/boot2/boot.c
697697
698698
699699
700
700
701
702
703
704
705
701706
702707
703708
......
713718
714719
715720
716
721
717722
718723
719724
verbose("Kernel cache did not load %s\n ", bootFile);
}
bootFile = bootInfo->bootFile;
if (checkOSVersion("10.7")) {
bootFile = gBootKernelCacheFile;
}
else {
sprintf(bootFile, "\%s", bootInfo->bootFile);
}
// Try to load kernel image from alternate locations on boot helper partitions.
sprintf(bootFileSpec, "com.apple.boot.P%s", bootFile);
if (ret == -1)
{
// No alternate location found, using the original kernel image path.
strcpy(bootFileSpec, bootFile);
strcpy(bootFileSpec, bootInfo->bootFile);
}
}
}
branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.c
605605
606606
607607
608
608
609
610
611
612
613
609614
610615
611616
......
621626
622627
623628
624
629
625630
626631
627632
verbose("Kernel cache did not load %s\n ", bootFile);
}
bootFile = bootInfo->bootFile;
if (checkOSVersion("10.7")) {
bootFile = gBootKernelCacheFile;
}
else {
sprintf(bootFile, "\%s", bootInfo->bootFile);
}
// Try to load kernel image from alternate locations on boot helper partitions.
sprintf(bootFileSpec, "com.apple.boot.P%s", bootFile);
if (ret == -1)
{
// No alternate location found, using the original kernel image path.
strcpy(bootFileSpec, bootFile);
strcpy(bootFileSpec, bootInfo->bootFile);
}
}
}

Archive Download the corresponding diff file

Revision: 1310