From fce11b09566c54fb9cbb4ba8def0ff23876b3bd0 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Fri, 18 Nov 2022 08:21:21 +0000
Subject: [PATCH 1/3] Fix LoadEarly & ROM read error

---
 config-custom.plist          | 62 ++----------------------------------
 config-nopicker-custom.plist | 62 ++----------------------------------
 2 files changed, 6 insertions(+), 118 deletions(-)

diff --git a/config-custom.plist b/config-custom.plist
index c9f8b3c..8d97a19 100644
--- a/config-custom.plist
+++ b/config-custom.plist
@@ -1272,7 +1272,9 @@
 			<key>ProcessorType</key>
 			<integer>0</integer>
 			<key>ROM</key>
-			<data>{{ROM}}</data>
+			<data>
+			{{ROM}}
+			</data>
 			<key>SpoofVendor</key>
 			<true/>
 			<key>SystemMemoryStatus</key>
@@ -1373,8 +1375,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<true/>
 				<key>Path</key>
 				<string>OpenVariableRuntimeDxe.efi</string>
 			</dict>
@@ -1385,8 +1385,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<true/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenRuntime.efi</string>
 			</dict>
@@ -1397,8 +1395,6 @@
 				<string>HFS+ Driver</string>
 				<key>Enabled</key>
 				<true/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenHfsPlus.efi</string>
 			</dict>
@@ -1409,8 +1405,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<true/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenCanopy.efi</string>
 			</dict>
@@ -1421,8 +1415,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>AudioDxe.efi</string>
 			</dict>
@@ -1433,8 +1425,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<true/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenPartitionDxe.efi</string>
 			</dict>
@@ -1445,8 +1435,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenUsbKbDxe.efi</string>
 			</dict>
@@ -1457,8 +1445,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>UsbMouseDxe.efi</string>
 			</dict>
@@ -1469,8 +1455,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>Ps2KeyboardDxe.efi</string>
 			</dict>
@@ -1481,8 +1465,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>Ps2MouseDxe.efi</string>
 			</dict>
@@ -1493,8 +1475,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>HiiDatabase.efi</string>
 			</dict>
@@ -1505,8 +1485,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>NvmExpressDxe.efi</string>
 			</dict>
@@ -1517,8 +1495,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>XhciDxe.efi</string>
 			</dict>
@@ -1529,8 +1505,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>ExFatDxe.efi</string>
 			</dict>
@@ -1541,8 +1515,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>CrScreenshotDxe.efi</string>
 			</dict>
@@ -1553,8 +1525,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>Ext4Dxe.efi</string>
 			</dict>
@@ -1565,35 +1535,9 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenLinuxBoot.efi</string>
 			</dict>
-			<dict>
-				<key>Arguments</key>
-				<string></string>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<true/>
-				<key>LoadEarly</key>
-				<false/>
-				<key>Path</key>
-				<string>ResetNvramEntry.efi</string>
-			</dict>
-			<dict>
-				<key>Arguments</key>
-				<string></string>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<false/>
-				<key>LoadEarly</key>
-				<false/>
-				<key>Path</key>
-				<string>ToggleSipEntry.efi</string>
-			</dict>
 		</array>
 		<key>Input</key>
 		<dict>
diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist
index 49924c8..09e6643 100644
--- a/config-nopicker-custom.plist
+++ b/config-nopicker-custom.plist
@@ -1272,7 +1272,9 @@
 			<key>ProcessorType</key>
 			<integer>0</integer>
 			<key>ROM</key>
-			<data>{{ROM}}</data>
+			<data>
+			{{ROM}}
+			</data>
 			<key>SpoofVendor</key>
 			<true/>
 			<key>SystemMemoryStatus</key>
@@ -1373,8 +1375,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<true/>
 				<key>Path</key>
 				<string>OpenVariableRuntimeDxe.efi</string>
 			</dict>
@@ -1385,8 +1385,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<true/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenRuntime.efi</string>
 			</dict>
@@ -1397,8 +1395,6 @@
 				<string>HFS+ Driver</string>
 				<key>Enabled</key>
 				<true/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenHfsPlus.efi</string>
 			</dict>
@@ -1409,8 +1405,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<true/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenCanopy.efi</string>
 			</dict>
@@ -1421,8 +1415,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>AudioDxe.efi</string>
 			</dict>
@@ -1433,8 +1425,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<true/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenPartitionDxe.efi</string>
 			</dict>
@@ -1445,8 +1435,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenUsbKbDxe.efi</string>
 			</dict>
@@ -1457,8 +1445,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>UsbMouseDxe.efi</string>
 			</dict>
@@ -1469,8 +1455,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>Ps2KeyboardDxe.efi</string>
 			</dict>
@@ -1481,8 +1465,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>Ps2MouseDxe.efi</string>
 			</dict>
@@ -1493,8 +1475,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>HiiDatabase.efi</string>
 			</dict>
@@ -1505,8 +1485,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>NvmExpressDxe.efi</string>
 			</dict>
@@ -1517,8 +1495,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>XhciDxe.efi</string>
 			</dict>
@@ -1529,8 +1505,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>ExFatDxe.efi</string>
 			</dict>
@@ -1541,8 +1515,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>CrScreenshotDxe.efi</string>
 			</dict>
@@ -1553,8 +1525,6 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>Ext4Dxe.efi</string>
 			</dict>
@@ -1565,35 +1535,9 @@
 				<string></string>
 				<key>Enabled</key>
 				<false/>
-				<key>LoadEarly</key>
-				<false/>
 				<key>Path</key>
 				<string>OpenLinuxBoot.efi</string>
 			</dict>
-			<dict>
-				<key>Arguments</key>
-				<string></string>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<true/>
-				<key>LoadEarly</key>
-				<false/>
-				<key>Path</key>
-				<string>ResetNvramEntry.efi</string>
-			</dict>
-			<dict>
-				<key>Arguments</key>
-				<string></string>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<false/>
-				<key>LoadEarly</key>
-				<false/>
-				<key>Path</key>
-				<string>ToggleSipEntry.efi</string>
-			</dict>
 		</array>
 		<key>Input</key>
 		<dict>

From a79d55477190d77e3b489bbbe6005c892e8eb8f9 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Sat, 19 Nov 2022 03:35:25 +0000
Subject: [PATCH 2/3] Fix automated and all boot-up tests by removing EFI boot
 option

---
 config-custom.plist          | 2 --
 config-nopicker-custom.plist | 2 --
 2 files changed, 4 deletions(-)

diff --git a/config-custom.plist b/config-custom.plist
index 8d97a19..1c58cc4 100644
--- a/config-custom.plist
+++ b/config-custom.plist
@@ -1085,8 +1085,6 @@
 			<data></data>
 			<key>PasswordSalt</key>
 			<data></data>
-			<key>ScanPolicy</key>
-			<integer>0</integer>
 			<key>SecureBootModel</key>
 			<string>Disabled</string>
 			<key>Vault</key>
diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist
index 09e6643..da4b573 100644
--- a/config-nopicker-custom.plist
+++ b/config-nopicker-custom.plist
@@ -1085,8 +1085,6 @@
 			<data></data>
 			<key>PasswordSalt</key>
 			<data></data>
-			<key>ScanPolicy</key>
-			<integer>0</integer>
 			<key>SecureBootModel</key>
 			<string>Disabled</string>
 			<key>Vault</key>

From 92148ee1831fe13f223ff87bce18bd27b401beb9 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Sat, 19 Nov 2022 09:28:47 +0000
Subject: [PATCH 3/3] 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 1c58cc4..3d26e39 100644
--- a/config-custom.plist
+++ b/config-custom.plist
@@ -1,6 +1,7 @@
 <!-- This file is modified by @sickcodes from https://github.com/kholia/OSX-KVM/tree/master/OpenCore-Catalina -->
 <!-- The modifications are placeholders for: {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}} -->
 <!-- All credit for this file https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md -->
+<!-- Scan policy generator: https://oc-scanpolicy.vercel.app/ -->
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -1085,6 +1086,8 @@
 			<data></data>
 			<key>PasswordSalt</key>
 			<data></data>
+			<key>ScanPolicy</key>
+			<integer>13056</integer>
 			<key>SecureBootModel</key>
 			<string>Disabled</string>
 			<key>Vault</key>
diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist
index da4b573..7033537 100644
--- a/config-nopicker-custom.plist
+++ b/config-nopicker-custom.plist
@@ -1,6 +1,7 @@
 <!-- This file is modified by @sickcodes from https://github.com/kholia/OSX-KVM/tree/master/OpenCore-Catalina -->
 <!-- The modifications are placeholders for: {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}} -->
 <!-- All credit for this file https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md -->
+<!-- Scan policy generator: https://oc-scanpolicy.vercel.app/ -->
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -1085,6 +1086,8 @@
 			<data></data>
 			<key>PasswordSalt</key>
 			<data></data>
+			<key>ScanPolicy</key>
+			<integer>13056</integer>
 			<key>SecureBootModel</key>
 			<string>Disabled</string>
 			<key>Vault</key>