Fix macOS 13+ recovery and installer detection

references acidanthera/bugtracker#2248
acidanthera · May 7, 2023 · d3ed12a · d3ed12a
1 parent f07e333
commit d3ed12a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 Lilu Changelog
 ==============
+#### v1.6.5
+- Fixed macOS 13+ recovery and installer detection
+
 #### v1.6.4
 - Added AMD IGPU detection
 

diff --git a/Lilu/Sources/kern_start.cpp b/Lilu/Sources/kern_start.cpp
@@ -20,6 +20,8 @@
 
 #include <IOKit/IOLib.h>
 #include <IOKit/IORegistryEntry.h>
+#include <IOKit/IODeviceTreeSupport.h>
+
 #include <mach/mach_types.h>
 
 OSDefineMetaClassAndStructors(PRODUCT_NAME, IOService)
@@ -274,11 +276,19 @@ bool Configuration::getBootArguments() {
 
 	allowDecompress = !checkKernelArgument(bootargLowMem);
 
-	installOrRecovery |= checkKernelArgument("rp0");
-	installOrRecovery |= checkKernelArgument("rp");
-	installOrRecovery |= checkKernelArgument("container-dmg");
-	installOrRecovery |= checkKernelArgument("root-dmg");
-	installOrRecovery |= checkKernelArgument("auth-root-dmg");
+	auto entry = IORegistryEntry::fromPath("/chosen", gIODTPlane);
+	if (entry) {
+		installOrRecovery = entry->getProperty("boot-ramdmg-extents") != nullptr;
+		entry->release();
+	}
+
+	if (!installOrRecovery && getKernelVersion() < KernelVersion::Ventura) {
+		installOrRecovery |= checkKernelArgument("rp0");
+		installOrRecovery |= checkKernelArgument("rp");
+		installOrRecovery |= checkKernelArgument("container-dmg");
+		installOrRecovery |= checkKernelArgument("root-dmg");
+		installOrRecovery |= checkKernelArgument("auth-root-dmg");
+	}
 
 	safeMode = checkKernelArgument("-x");