Chameleon Commit Details - 2846 - Chameleon open source boot loader project.

Date:

2017-02-02 19:45:48 (7 years 2 months ago)

Author:

ErmaC

Commit:

2846

Parents:

2845

Message:

Update for Kernel ver. detection and macOS installer path (by Micky1979)

Changes:

M	/branches/ErmaC/Enoch/i386/boot2/drivers.c
M	/branches/ErmaC/Enoch/i386/libsaio/disk.c

File differences

-1710
1711 1711
1712 1712
1713 
1713
1714 1714
1715 1715
1716 1716
+␉char *MavPattern    = "Install%20OS%20X%20Mavericks";␊
␉char *YosPattern    = "Install%20OS%20X%20Yosemite";␊
␉char *ECPattern     = "Install%20OS%20X%20El%20Capitan";␊
␉char *SierraPattern = "Install%10.12";␊
␉char *SierraPattern = "Install%20macOS%20Sierra";␊
␊
␉/*␊
␉ * Only look for OS Version on HFS+␊
 ␉char *MavPattern    = "Install%20OS%20X%20Mavericks";␊
 ␉char *YosPattern    = "Install%20OS%20X%20Yosemite";␊
 ␉char *ECPattern     = "Install%20OS%20X%20El%20Capitan";␊
-␉char *SierraPattern = "Install%10.12";␊
+␉char *SierraPattern = "Install%20macOS%20Sierra";␊
 ␊
 ␉/*␊
 ␉ * Only look for OS Version on HFS+␊

-1155
1156 1156
1157 1157
1158 
1158
1159
1160
1161
1162
1163
1159 1164
1160 1165
1161 1166
1162 
1163 
1167
1168
1164 1169
1165 1170
1166 1171
... ...
1215 1220
1216 1221
1217 1222
1223
1224
1225
1226
1218 1227
1219 
1228
1220 1229
1221 1230
1222 1231
+␉␉␉␉switch (gDarwinMinor)␊
␉␉␉␉{␊
␉␉␉␉␉case 0: kernelOSVer = 0xA0C0000; break;␊
␉␉␉␉␉default:kernelOSVer = 0xA0C0000; break; //Last known kernel (add here updates)␊
␉␉␉␉␉case 1: kernelOSVer = 0xA0C0100; break;␊
␉␉␉␉␉case 2: kernelOSVer = 0xA0C0200; break;␊
␉␉␉␉␉case 3: kernelOSVer = 0xA0C0200; break;␊
␉␉␉␉␉case 4: kernelOSVer = 0xA0C0300; break;␊
␉␉␉␉␉case 5: kernelOSVer = 0xA0C0400; break;␊
␉␉␉␉␉default:kernelOSVer = 0xA0C0400; break; //Last known kernel (add here updates)␊
␉␉␉␉}␊
␉␉␉␉break;␊
␉␉␉default:␊
␉␉␉␉kernelOSVer = 0xA0B0100;␊
␉␉␉␉break; //Last known kernel␊
␉␉␉␉kernelOSVer = 0xA0C0400;␊
␉␉␉␉break;␊
␉␉␉}␊
␉␉}␊
␉␉else␊

␉␉␉case 0xA0B0600: gDarwinMajor = 15; gDarwinMinor =  6; gDarwinRev = 0; break; // 10.11.6␊
␉␉␉// Sierra␊
␉␉␉case 0xA0C0000: gDarwinMajor = 16; gDarwinMinor =  0; gDarwinRev = 0; break; // 10.12␊
␉␉␉case 0xA0C0100: gDarwinMajor = 16; gDarwinMinor =  1; gDarwinRev = 0; break; // 10.12.1␊
␉␉␉case 0xA0C0200: gDarwinMajor = 16; gDarwinMinor =  3; gDarwinRev = 0; break; // 10.12.2␊
␉␉␉case 0xA0C0300: gDarwinMajor = 16; gDarwinMinor =  4; gDarwinRev = 0; break; // 10.12.3␊
␉␉␉case 0xA0C0400: gDarwinMajor = 16; gDarwinMinor =  5; gDarwinRev = 0; break; // 10.12.4␊
␉␉␉// default = last known kernel␊
␉␉␉default:        gDarwinMajor = 16; gDarwinMinor =  0; gDarwinRev = 0; break; // 10.12;␊
␉␉␉default:        gDarwinMajor = 16; gDarwinMinor =  5; gDarwinRev = 0; break; // 10.12.4;␊
␉␉}␊
␉}␊
␊
 ...
 ␉␉␉␉switch (gDarwinMinor)␊
 ␉␉␉␉{␊
 ␉␉␉␉␉case 0: kernelOSVer = 0xA0C0000; break;␊
-␉␉␉␉␉default:kernelOSVer = 0xA0C0000; break; //Last known kernel (add here updates)␊
+␉␉␉␉␉case 1: kernelOSVer = 0xA0C0100; break;␊
+␉␉␉␉␉case 2: kernelOSVer = 0xA0C0200; break;␊
+␉␉␉␉␉case 3: kernelOSVer = 0xA0C0200; break;␊
+␉␉␉␉␉case 4: kernelOSVer = 0xA0C0300; break;␊
+␉␉␉␉␉case 5: kernelOSVer = 0xA0C0400; break;␊
+␉␉␉␉␉default:kernelOSVer = 0xA0C0400; break; //Last known kernel (add here updates)␊
 ␉␉␉␉}␊
 ␉␉␉␉break;␊
 ␉␉␉default:␊
-␉␉␉␉kernelOSVer = 0xA0B0100;␊
-␉␉␉␉break; //Last known kernel␊
+␉␉␉␉kernelOSVer = 0xA0C0400;␊
+␉␉␉␉break;␊
 ␉␉␉}␊
 ␉␉}␊
 ␉␉else␊
 ␉␉␉case 0xA0B0600: gDarwinMajor = 15; gDarwinMinor =  6; gDarwinRev = 0; break; // 10.11.6␊
 ␉␉␉// Sierra␊
 ␉␉␉case 0xA0C0000: gDarwinMajor = 16; gDarwinMinor =  0; gDarwinRev = 0; break; // 10.12␊
+␉␉␉case 0xA0C0100: gDarwinMajor = 16; gDarwinMinor =  1; gDarwinRev = 0; break; // 10.12.1␊
+␉␉␉case 0xA0C0200: gDarwinMajor = 16; gDarwinMinor =  3; gDarwinRev = 0; break; // 10.12.2␊
+␉␉␉case 0xA0C0300: gDarwinMajor = 16; gDarwinMinor =  4; gDarwinRev = 0; break; // 10.12.3␊
+␉␉␉case 0xA0C0400: gDarwinMajor = 16; gDarwinMinor =  5; gDarwinRev = 0; break; // 10.12.4␊
 ␉␉␉// default = last known kernel␊
-␉␉␉default:        gDarwinMajor = 16; gDarwinMinor =  0; gDarwinRev = 0; break; // 10.12;␊
+␉␉␉default:        gDarwinMajor = 16; gDarwinMinor =  5; gDarwinRev = 0; break; // 10.12.4;␊
 ␉␉}␊
 ␉}␊
 ␊

Download the corresponding diff file