Chameleon

Chameleon Commit Details

Date:2018-01-13 23:57:22 (3 months 13 days ago)
Author:ErmaC
Commit:2906
Parents: 2905
Message:typo only
Changes:
M/trunk/i386/boot2/drivers.c
M/trunk/i386/libsaio/bootargs.h
M/branches/ErmaC/Enoch/i386/boot2/drivers.c
M/trunk/i386/boot2/boot.c
M/branches/ErmaC/Enoch/i386/libsaio/bootargs.h
M/trunk/i386/libsaio/disk.c
M/branches/ErmaC/Enoch/i386/boot2/boot.c
M/trunk/i386/boot2/boot.h
M/branches/ErmaC/Enoch/i386/libsaio/disk.c
M/branches/ErmaC/Enoch/i386/boot2/boot.h

File differences

trunk/i386/libsaio/bootargs.h
136136
137137
138138
139
139140
140141
141142
......
148149
149150
150151
152
151153
152154
153155
......
157159
158160
159161
160
162
163
161164
165
162166
163167
164168
#define kBootArgsFlagBlackBg(1 << 6)
#define kBootArgsFlagLoginUI(1 << 7)
#define kBootArgsFlagInstallUI(1 << 8)
#define kBootArgsFlagUnknownHS(1 << 9)// 512 (High Sierra only)
/* Rootless configuration flags */
// http://www.idelta.info/archives/kext-to-check-sip-rootless-status-on-el-capitan/
#define CSR_ALLOW_UNRESTRICTED_NVRAM(1 << 6) /* Allow unrestricted NVRAM */
#define CSR_ALLOW_DEVICE_CONFIGURATION(1 << 7) /* Allow device configuration */
#define CSR_ALLOW_ANY_RECOVERY_OS(1 << 8)
#define CSR_ALLOW_UNAPPROVED_KEXTS(1 << 9)
#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
CSR_ALLOW_UNRESTRICTED_FS | \
CSR_ALLOW_UNRESTRICTED_DTRACE | \
CSR_ALLOW_UNRESTRICTED_NVRAM | \
CSR_ALLOW_DEVICE_CONFIGURATION | \
CSR_ALLOW_ANY_RECOVERY_OS)
CSR_ALLOW_ANY_RECOVERY_OS | \
CSR_ALLOW_UNAPPROVED_KEXTS)
typedef struct boot_args
{
uint16_t Revision;/* Revision of boot_args structure */
trunk/i386/libsaio/disk.c
17051705
17061706
17071707
1708
1709
1710
1711
1712
1713
1714
1715
1708
1709
1710
1711
1712
1713
1714
1715
17161716
17171717
17181718
const char *fakeOSVersion;
int fakeOSVersionInt;
// our pattern: avoiding to use full path. this help if the app is named as Beta or DP..
char *LionPattern = "Install%20Mac%20OS%20X%20Lion";
char *MLPattern = "Install%20OS%20X%20Mountain%20Lion";
char *MavPattern = "Install%20OS%20X%20Mavericks";
char *YosPattern = "Install%20OS%20X%20Yosemite";
char *ECPattern = "Install%20OS%20X%20El%20Capitan";
char *SierraPattern = "Install%20macOS%20Sierra";
char *HSierraPattern = "Install%20macOS%20High%20Sierra";
char *HSierraPatternB = "Install%20macOS%2010.13";
char *LionPattern= "Install%20Mac%20OS%20X%20Lion";// Install Mac OS Lion
char *MLPattern= "Install%20OS%20X%20Mountain%20Lion";// Install OS X Mountain Lion
char *MavPattern= "Install%20OS%20X%20Mavericks";// Install OS X Mavericks
char *YosPattern= "Install%20OS%20X%20Yosemite";// Install OS X Yosemite
char *ECPattern= "Install%20OS%20X%20El%20Capitan";// Install OS X El Capitan
char *SierraPattern= "Install%20macOS%20Sierra";// Install macOS Sierra
char *HSierraPattern= "Install%20macOS%20High%20Sierra";// Install macOS High Sierra
char *HSierraPatternB= "Install%20macOS%2010.13";// Install macOS 10.13
/*
* Only look for OS Version on HFS+
trunk/i386/boot2/drivers.c
11611161
11621162
11631163
1164
1165
1166
1167
1168
1169
1164
1165
1166
1167
1168
1169
11701170
11711171
11721172
11731173
11741174
11751175
1176
1177
1178
1176
1177
1178
11791179
1180
1181
1180
1181
11821182
11831183
11841184
......
12411241
12421242
12431243
1244
1245
12441246
12451247
1246
1248
12471249
12481250
12491251
default:kernelOSVer = 0xA0C0600; break; //Last known kernel (add here updates)
}
break;
//case 17: /* High Sierra */
//switch (gDarwinMinor)
//{
//case 0: kernelOSVer = 0xA0C0000; break;
//case 1: kernelOSVer = 0xA0C0100; break;
//case 2: kernelOSVer = 0xA0C0200; break;
case 17: /* High Sierra */
switch (gDarwinMinor)
{
case 0: kernelOSVer = 0xA0D0000; break;
case 1: kernelOSVer = 0xA0D0100; break;
//case 2: kernelOSVer = 0xA0D0200; break; // 17.2.0
//case 3: kernelOSVer = 0xA0C0200; break;
//case 4: kernelOSVer = 0xA0C0300; break;
//case 5: kernelOSVer = 0xA0C0400; break;
//case 6: kernelOSVer = 0xA0C0500; break;
//case 7: kernelOSVer = 0xA0C0600; break;
//case 8: kernelOSVer = 0xA0C0700; break;
//default:kernelOSVer = 0xA0C0600; break; //Last known kernel (add here updates)
//}
//break;
default:kernelOSVer = 0xA0D0100; break; //Last known kernel (add here updates)
}
break;
default:
kernelOSVer = 0xA0C0600;
break; //Last known kernel is Sierra 10.12.6
kernelOSVer = 0xA0D0100;
break; //Last known kernel is Sierra 10.13.1
}
}
else
case 0xA0C0600: gDarwinMajor = 16; gDarwinMinor = 7; gDarwinRev = 0; break; // 10.12.6
//case 0xA0C0700: gDarwinMajor = 16; gDarwinMinor = x; gDarwinRev = x; break; // 10.12.7
// High Sierra
case 0xA0D0000: gDarwinMajor = 17; gDarwinMinor = 0; gDarwinRev = 0; break; // 10.13
case 0xA0D0100: gDarwinMajor = 17; gDarwinMinor = 1; gDarwinRev = 0; break; // 10.13.1
// default = last known kernel
default: gDarwinMajor = 16; gDarwinMinor = 7; gDarwinRev = 0; break; // 10.12.6;
default: gDarwinMajor = 17; gDarwinMinor = 1; gDarwinRev = 0; break; // 10.13.1;
}
}
trunk/i386/boot2/boot.c
352352
353353
354354
355
355
356
357
358
356359
357
360
358361
359362
360363
{
snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kMLionInstallerDataFolder);
}
else if ( MacOSVerCurrent > MacOSVer2Int("10.12") && MacOSVerCurrent < MacOSVer2Int("10.14") )
{
snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kHSierraInstallerDataFolder);
}
}
else if (isRecoveryHD)
else if (isRecoveryHD)
{
snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kDefaultCacheRecoveryHD);
}
trunk/i386/boot2/boot.h
5757
5858
5959
60
61
62
6063
6164
6265
// Mountain Lion installer ??
#define kMLionInstallerDataFolder"/OS X Install Data/"
// High Sierra ??
#define kHSierraInstallerDataFolder"/macOS Install Data/"
// Installer new
#define kDefaultCacheInstallerNew"/.IABootFiles/"
branches/ErmaC/Enoch/i386/libsaio/bootargs.h
136136
137137
138138
139
139140
140141
141142
......
148149
149150
150151
152
151153
152154
153155
......
157159
158160
159161
160
162
163
161164
165
162166
163167
164168
#define kBootArgsFlagBlackBg(1 << 6)
#define kBootArgsFlagLoginUI(1 << 7)
#define kBootArgsFlagInstallUI(1 << 8)
#define kBootArgsFlagUnknownHS(1 << 9)// 512 (High Sierra only)
/* Rootless configuration flags */
// http://www.idelta.info/archives/kext-to-check-sip-rootless-status-on-el-capitan/
#define CSR_ALLOW_UNRESTRICTED_NVRAM(1 << 6) /* Allow unrestricted NVRAM */
#define CSR_ALLOW_DEVICE_CONFIGURATION(1 << 7) /* Allow device configuration */
#define CSR_ALLOW_ANY_RECOVERY_OS(1 << 8)
#define CSR_ALLOW_UNAPPROVED_KEXTS(1 << 9)
#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
CSR_ALLOW_UNRESTRICTED_FS | \
CSR_ALLOW_UNRESTRICTED_DTRACE | \
CSR_ALLOW_UNRESTRICTED_NVRAM | \
CSR_ALLOW_DEVICE_CONFIGURATION | \
CSR_ALLOW_ANY_RECOVERY_OS)
CSR_ALLOW_ANY_RECOVERY_OS | \
CSR_ALLOW_UNAPPROVED_KEXTS)
typedef struct boot_args
{
uint16_t Revision;/* Revision of boot_args structure */
branches/ErmaC/Enoch/i386/libsaio/disk.c
17051705
17061706
17071707
1708
1709
1710
1711
1712
1713
1714
1715
1708
1709
1710
1711
1712
1713
1714
1715
17161716
17171717
17181718
const char *fakeOSVersion;
int fakeOSVersionInt;
// our pattern: avoiding to use full path. this help if the app is named as Beta or DP..
char *LionPattern = "Install%20Mac%20OS%20X%20Lion";
char *MLPattern = "Install%20OS%20X%20Mountain%20Lion";
char *MavPattern = "Install%20OS%20X%20Mavericks";
char *YosPattern = "Install%20OS%20X%20Yosemite";
char *ECPattern = "Install%20OS%20X%20El%20Capitan";
char *SierraPattern = "Install%20macOS%20Sierra";
char *HSierraPattern = "Install%20macOS%20High%20Sierra";
char *HSierraPatternB = "Install%20macOS%2010.13";
char *LionPattern= "Install%20Mac%20OS%20X%20Lion";// Install Mac OS Lion
char *MLPattern= "Install%20OS%20X%20Mountain%20Lion";// Install OS X Mountain Lion
char *MavPattern= "Install%20OS%20X%20Mavericks";// Install OS X Mavericks
char *YosPattern= "Install%20OS%20X%20Yosemite";// Install OS X Yosemite
char *ECPattern= "Install%20OS%20X%20El%20Capitan";// Install OS X El Capitan
char *SierraPattern= "Install%20macOS%20Sierra";// Install macOS Sierra
char *HSierraPattern= "Install%20macOS%20High%20Sierra";// Install macOS High Sierra
char *HSierraPatternB= "Install%20macOS%2010.13";// Install macOS 10.13
/*
* Only look for OS Version on HFS+
branches/ErmaC/Enoch/i386/boot2/drivers.c
15381538
15391539
15401540
1541
1542
1543
1544
1545
1546
1541
1542
1543
1544
1545
1546
15471547
15481548
15491549
15501550
15511551
15521552
1553
1554
1555
1553
1554
1555
15561556
1557
1558
1557
1558
15591559
15601560
15611561
......
16181618
16191619
16201620
1621
1622
16211623
16221624
1623
1625
16241626
16251627
16261628
default:kernelOSVer = 0xA0C0600; break; //Last known kernel (add here updates)
}
break;
//case 17: /* High Sierra */
//switch (gDarwinMinor)
//{
//case 0: kernelOSVer = 0xA0C0000; break;
//case 1: kernelOSVer = 0xA0C0100; break;
//case 2: kernelOSVer = 0xA0C0200; break;
case 17: /* High Sierra */
switch (gDarwinMinor)
{
case 0: kernelOSVer = 0xA0D0000; break;
case 1: kernelOSVer = 0xA0D0100; break;
//case 2: kernelOSVer = 0xA0D0200; break; // 17.2.0
//case 3: kernelOSVer = 0xA0C0200; break;
//case 4: kernelOSVer = 0xA0C0300; break;
//case 5: kernelOSVer = 0xA0C0400; break;
//case 6: kernelOSVer = 0xA0C0500; break;
//case 7: kernelOSVer = 0xA0C0600; break;
//case 8: kernelOSVer = 0xA0C0700; break;
//default:kernelOSVer = 0xA0C0600; break; //Last known kernel (add here updates)
//}
//break;
default:kernelOSVer = 0xA0D0100; break; //Last known kernel (add here updates)
}
break;
default:
kernelOSVer = 0xA0C0600;
break; //Last known kernel is Sierra 10.12.6
kernelOSVer = 0xA0D0100;
break; //Last known kernel is Sierra 10.13.1
}
}
else
case 0xA0C0600: gDarwinMajor = 16; gDarwinMinor = 7; gDarwinRev = 0; break; // 10.12.6
//case 0xA0C0700: gDarwinMajor = 16; gDarwinMinor = x; gDarwinRev = x; break; // 10.12.7
// High Sierra
case 0xA0D0000: gDarwinMajor = 17; gDarwinMinor = 0; gDarwinRev = 0; break; // 10.13
case 0xA0D0100: gDarwinMajor = 17; gDarwinMinor = 1; gDarwinRev = 0; break; // 10.13.1
// default = last known kernel
default: gDarwinMajor = 16; gDarwinMinor = 7; gDarwinRev = 0; break; // 10.12.6;
default: gDarwinMajor = 17; gDarwinMinor = 1; gDarwinRev = 0; break; // 10.13.1;
}
}
branches/ErmaC/Enoch/i386/boot2/boot.c
422422
423423
424424
425
425
426
427
428
426429
427
430
428431
429432
430433
{
snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kMLionInstallerDataFolder);
}
else if ( MacOSVerCurrent > MacOSVer2Int("10.12") && MacOSVerCurrent < MacOSVer2Int("10.14") )
{
snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kHSierraInstallerDataFolder);
}
}
else if (isRecoveryHD)
else if (isRecoveryHD)
{
snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%skernelcache", kDefaultCacheRecoveryHD);
}
branches/ErmaC/Enoch/i386/boot2/boot.h
5757
5858
5959
60
61
62
6063
6164
6265
// Mountain Lion installer ??
#define kMLionInstallerDataFolder"/OS X Install Data/"
// High Sierra ??
#define kHSierraInstallerDataFolder"/macOS Install Data/"
// Installer new
#define kDefaultCacheInstallerNew"/.IABootFiles/"

Archive Download the corresponding diff file

Revision: 2906