From 9da1625bb8965753b67e2aa0ba1eb4a316dc8a11 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 19 Nov 2022 03:23:59 +0000 Subject: [PATCH 1/8] Remove EFI option, add SIP Toggle --- config-custom.plist | 6 +++--- config-nopicker-custom.plist | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config-custom.plist b/config-custom.plist index c9f8b3c..e3be0b3 100644 --- a/config-custom.plist +++ b/config-custom.plist @@ -1066,7 +1066,9 @@ AllowNvramReset AllowSetDefault - + + AllowToggleSip + ApECID 0 AuthRestart @@ -1085,8 +1087,6 @@ PasswordSalt - ScanPolicy - 0 SecureBootModel Disabled Vault diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist index 49924c8..28a42d6 100644 --- a/config-nopicker-custom.plist +++ b/config-nopicker-custom.plist @@ -1066,7 +1066,9 @@ AllowNvramReset AllowSetDefault - + + AllowToggleSip + ApECID 0 AuthRestart @@ -1085,8 +1087,6 @@ PasswordSalt - ScanPolicy - 0 SecureBootModel Disabled Vault From 123b8a24e5d198c2dba7802b28f247e664853c62 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 19 Nov 2022 03:31:57 +0000 Subject: [PATCH 2/8] Fix some schema errors --- config-custom.plist | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config-custom.plist b/config-custom.plist index e3be0b3..068df52 100644 --- a/config-custom.plist +++ b/config-custom.plist @@ -1063,12 +1063,8 @@ Security - AllowNvramReset - AllowSetDefault - AllowToggleSip - ApECID 0 AuthRestart @@ -1220,8 +1216,7 @@ ForceDisplayRotationInEFI - LegacyEnable - + LegacyOverwrite LegacySchema @@ -1272,7 +1267,9 @@ ProcessorType 0 ROM - {{ROM}} + + {{ROM}} + SpoofVendor SystemMemoryStatus From 82fb776e14a1475a6e86cd535671709af524020f Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 19 Nov 2022 09:38:07 +0000 Subject: [PATCH 3/8] Copy to nopicker --- config-nopicker-custom.plist | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist index 28a42d6..2a676f9 100644 --- a/config-nopicker-custom.plist +++ b/config-nopicker-custom.plist @@ -1272,7 +1272,9 @@ ProcessorType 0 ROM - {{ROM}} + + {{ROM}} + SpoofVendor SystemMemoryStatus From 6587c1aca467242f6086f2d78da9a0d80928c857 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 19 Nov 2022 09:38:33 +0000 Subject: [PATCH 4/8] Cherry pick: Scan policy update --- config-custom.plist | 3 +++ config-nopicker-custom.plist | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config-custom.plist b/config-custom.plist index 068df52..7c078b8 100644 --- a/config-custom.plist +++ b/config-custom.plist @@ -1,6 +1,7 @@ + @@ -1083,6 +1084,8 @@ PasswordSalt + ScanPolicy + 13056 SecureBootModel Disabled Vault diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist index 2a676f9..f67e5e1 100644 --- a/config-nopicker-custom.plist +++ b/config-nopicker-custom.plist @@ -1,6 +1,7 @@ + @@ -1087,6 +1088,8 @@ PasswordSalt + ScanPolicy + 13056 SecureBootModel Disabled Vault From 097eb8eb354f49d2be95915d12504b5a0aea7349 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 19 Nov 2022 09:44:17 +0000 Subject: [PATCH 5/8] ROM fix, remove VolumeAmplifier --- config-custom.plist | 6 +----- config-nopicker-custom.plist | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/config-custom.plist b/config-custom.plist index 7c078b8..d79f142 100644 --- a/config-custom.plist +++ b/config-custom.plist @@ -1270,9 +1270,7 @@ ProcessorType 0 ROM - - {{ROM}} - + {{ROM}} SpoofVendor SystemMemoryStatus @@ -1359,8 +1357,6 @@ SetupDelay 0 - VolumeAmplifier - 0 ConnectDrivers diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist index f67e5e1..836dc5f 100644 --- a/config-nopicker-custom.plist +++ b/config-nopicker-custom.plist @@ -1275,9 +1275,7 @@ ProcessorType 0 ROM - - {{ROM}} - + {{ROM}} SpoofVendor SystemMemoryStatus @@ -1364,8 +1362,6 @@ SetupDelay 0 - VolumeAmplifier - 0 ConnectDrivers From 44f47fc8a08de7c3d0cbc365418a21c8c2980462 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 19 Nov 2022 09:53:54 +0000 Subject: [PATCH 6/8] ROM is type mdata, which is base64'd --- generate-specific-bootdisk.sh | 3 ++- generate-unique-machine-values.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/generate-specific-bootdisk.sh b/generate-specific-bootdisk.sh index 48070a0..d0720aa 100755 --- a/generate-specific-bootdisk.sh +++ b/generate-specific-bootdisk.sh @@ -245,7 +245,8 @@ generate_bootdisk () { && [ "${UUID}" ] \ && [ "${MAC_ADDRESS}" ]; then ROM="${MAC_ADDRESS//\:/}" - ROM="${ROM,,}" + ROM="$(awk '{print tolower($0)}' <<< "${ROM}")" + ROM="$(base64 <<< "${ROM}")" sed -e s/\{\{DEVICE_MODEL\}\}/"${DEVICE_MODEL}"/g \ -e s/\{\{SERIAL\}\}/"${SERIAL}"/g \ -e s/\{\{BOARD_SERIAL\}\}/"${BOARD_SERIAL}"/g \ diff --git a/generate-unique-machine-values.sh b/generate-unique-machine-values.sh index 9577356..78f7e97 100755 --- a/generate-unique-machine-values.sh +++ b/generate-unique-machine-values.sh @@ -338,6 +338,7 @@ EOF source "${OUTPUT_ENV_FILE}" ROM="${MAC_ADDRESS//\:/}" ROM="$(awk '{print tolower($0)}' <<< "${ROM}")" + ROM="$(base64 <<< "${ROM}")" sed -e s/\{\{DEVICE_MODEL\}\}/"${DEVICE_MODEL}"/g \ -e s/\{\{SERIAL\}\}/"${SERIAL}"/g \ -e s/\{\{BOARD_SERIAL\}\}/"${BOARD_SERIAL}"/g \ From 5c0f672d6ecf0c307f6d09768532058895ff5b43 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 19 Nov 2022 10:09:10 +0000 Subject: [PATCH 7/8] Remove deprecated entries, as per OC: https://www.insanelymac.com/forum/topic/351968-how-to-opencore-080-081-differences/ --- config-custom.plist | 5 ++--- config-nopicker-custom.plist | 10 ++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/config-custom.plist b/config-custom.plist index d79f142..f8b9655 100644 --- a/config-custom.plist +++ b/config-custom.plist @@ -1085,7 +1085,7 @@ PasswordSalt ScanPolicy - 13056 + 2687747 SecureBootModel Disabled Vault @@ -1219,7 +1219,6 @@ ForceDisplayRotationInEFI - LegacyOverwrite LegacySchema @@ -1270,7 +1269,7 @@ ProcessorType 0 ROM - {{ROM}} + 0016cb001122 SpoofVendor SystemMemoryStatus diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist index 836dc5f..e76b5b2 100644 --- a/config-nopicker-custom.plist +++ b/config-nopicker-custom.plist @@ -1064,12 +1064,8 @@ Security - AllowNvramReset - AllowSetDefault - AllowToggleSip - ApECID 0 AuthRestart @@ -1089,7 +1085,7 @@ PasswordSalt ScanPolicy - 13056 + 2687747 SecureBootModel Disabled Vault @@ -1223,8 +1219,6 @@ ForceDisplayRotationInEFI - LegacyEnable - LegacyOverwrite LegacySchema @@ -1275,7 +1269,7 @@ ProcessorType 0 ROM - {{ROM}} + 0016cb001122 SpoofVendor SystemMemoryStatus From bd423c87cde8110c39ba125bc566e7f457397bdc Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 19 Nov 2022 10:31:22 +0000 Subject: [PATCH 8/8] Fix ROM data type --- config-custom.plist | 2 +- config-nopicker-custom.plist | 2 +- generate-specific-bootdisk.sh | 1 - generate-unique-machine-values.sh | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config-custom.plist b/config-custom.plist index 8d1f9ef..f4f0519 100644 --- a/config-custom.plist +++ b/config-custom.plist @@ -1269,7 +1269,7 @@ ProcessorType 0 ROM - 0016cb001122 + {{ROM}} SpoofVendor SystemMemoryStatus diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist index c1c96af..590e892 100644 --- a/config-nopicker-custom.plist +++ b/config-nopicker-custom.plist @@ -1269,7 +1269,7 @@ ProcessorType 0 ROM - 0016cb001122 + {{ROM}} SpoofVendor SystemMemoryStatus diff --git a/generate-specific-bootdisk.sh b/generate-specific-bootdisk.sh index d0720aa..21c2804 100755 --- a/generate-specific-bootdisk.sh +++ b/generate-specific-bootdisk.sh @@ -246,7 +246,6 @@ generate_bootdisk () { && [ "${MAC_ADDRESS}" ]; then ROM="${MAC_ADDRESS//\:/}" ROM="$(awk '{print tolower($0)}' <<< "${ROM}")" - ROM="$(base64 <<< "${ROM}")" sed -e s/\{\{DEVICE_MODEL\}\}/"${DEVICE_MODEL}"/g \ -e s/\{\{SERIAL\}\}/"${SERIAL}"/g \ -e s/\{\{BOARD_SERIAL\}\}/"${BOARD_SERIAL}"/g \ diff --git a/generate-unique-machine-values.sh b/generate-unique-machine-values.sh index 78f7e97..9577356 100755 --- a/generate-unique-machine-values.sh +++ b/generate-unique-machine-values.sh @@ -338,7 +338,6 @@ EOF source "${OUTPUT_ENV_FILE}" ROM="${MAC_ADDRESS//\:/}" ROM="$(awk '{print tolower($0)}' <<< "${ROM}")" - ROM="$(base64 <<< "${ROM}")" sed -e s/\{\{DEVICE_MODEL\}\}/"${DEVICE_MODEL}"/g \ -e s/\{\{SERIAL\}\}/"${SERIAL}"/g \ -e s/\{\{BOARD_SERIAL\}\}/"${BOARD_SERIAL}"/g \