Chameleon

Chameleon Commit Details

Date:2011-07-06 10:56:48 (8 years 4 months ago)
Author:Azimutz
Commit:1123
Parents: 1122
Message:Temporary (i think) fix for Boot.plist loading: on options.c, call loadChameleonConfig() instead of loadSystemConfig(). Add missing bt(0,0) path to loadChameleonConfig(); needed to load the file from dedicated booter partitions, e.g. ESP*, usb drive, etc... *EFI system partition
Changes:
M/trunk/i386/boot2/options.c
M/trunk/i386/libsaio/stringTable.c

File differences

trunk/i386/libsaio/stringTable.c
644644
645645
646646
647
647648
649
648650
649
651
652
650653
651654
652655
......
660663
661664
662665
663
666
664667
665668
666669
{
char *dirspec[] = {
"rd(0,0)/Extra/org.chameleon.Boot.plist",
"bt(0,0)/Extra/org.chameleon.Boot.plist",
"/Extra/org.chameleon.Boot.plist",
"rd(0,0)/Extra/com.apple.Boot.plist", /* DEPRECIATED */
"/Extra/com.apple.Boot.plist", /* DEPRECIATED */
"bt(0,0)/Extra/com.apple.Boot.plist", /* DEPRECIATED */
"/Extra/com.apple.Boot.plist" /* DEPRECIATED */
};
int i, fd, count, ret=-1;
{
printf("%s is depreciated.\n", dirspec[i]);
dirspec[i][strlen(dirspec[i]) - strlen("com.apple.Boot.plist")] = 0;
printf("Please us the file %sorg.chameleon.Boot.plist instead\n", dirspec[i]);
printf("Please use the file %sorg.chameleon.Boot.plist instead.\n", dirspec[i]);
pause();
}
// read file
trunk/i386/boot2/options.c
11841184
11851185
11861186
1187
1187
1188
11881189
11891190
11901191
// 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
// in the config table, or use the default if not specified.

Archive Download the corresponding diff file

Revision: 1123