bugs: Allow 14.2 beta 4 and later as mostly fixed

Signed-off-by: Hector Martin <[email protected]>

Author: marcan

src/bugs.py

@@ -6,6 +6,8 @@
 
 ALLOWED_MACOS_MIN = "14.1.1"
 
+SAFE_MACOS_RVERSION_MIN = "23.3.55.5.2" # 14.2 beta 4
+
 PROMOTION_DEVICES = {
     "j314cap",
     "j314sap",
@@ -95,9 +97,10 @@ def sadness(sysinfo):
         p_error("successfully complete an Asahi Linux installation, as it cannot boot older")
         p_error("versions of macOS Recovery in this state.")
     print()
-    p_error("We cannot continue with the install. Sorry. You will have to wait for Apple")
-    p_error("to fix this properly in a future update. This bug is entirely outside of our")
-    p_error("control and there is no easy workaround at this time.")
+    p_error("Apple have deployed a fix for this issue in macOS 14.2 beta 4. To install")
+    p_error("Asahi Linux, you must upgrade to this version or later. If you do not wish")
+    p_error("to use a beta version of macOS, you will have to wait until the 14.2 final")
+    p_error("release is out.")
     print()
     p_plain("More information:")
     print()
@@ -116,9 +119,15 @@ def you_are_safe(main):
 
 def run_checks(main):
     if main.sysinfo.device_class not in PROMOTION_DEVICES:
+        logging.info("bugs: Not a ProMotion device")
         return
 
     if split_ver(main.sysinfo.sfr_ver) < split_ver(BUGGY_SFR_MIN):
+        logging.info("bugs: SFR not updated beyond problem version")
+        return
+
+    if split_ver(main.sysinfo.macos_restore_ver) >= split_ver(SAFE_MACOS_RVERSION_MIN):
+        logging.info("bugs: macOS is new enough to guarantee safety")
         return
 
     p_progress("Checking whether your machine is affected by critical Apple bugs...")

src/system.py

@@ -73,6 +73,7 @@ def fetch(self):
             self.boot_mode = boot_mode.split(b": ")[1].decode("ascii")
 
         self.macos_ver, self.macos_build = self.get_version("/System/Library/CoreServices/SystemVersion.plist")
+        self.macos_restore_ver = self.get_restore_version("/System/Library/CoreServices/RestoreVersion.plist")
         self.sfr_ver, self.sfr_build = self.get_version("/System/Volumes/iSCPreboot/SFR/current/SystemVersion.plist")
         self.fsfr_ver, self.fsfr_build = self.get_version("/System/Volumes/iSCPreboot/SFR/fallback/SystemVersion.plist")
         self.sfr_full_ver = self.get_restore_version("/System/Volumes/iSCPreboot/SFR/current/RestoreVersion.plist")
@@ -148,6 +149,7 @@ def show(self):
         p_info(f"  Default boot VGID: {col()}{self.default_boot}")
         p_info(f"  Boot mode: {col()}{self.boot_mode}")
         p_info(f"  OS version: {col()}{self.macos_ver} ({self.macos_build})")
+        p_info(f"  OS restore version: {col()}{self.macos_restore_ver}")
         p_info(f"  Main firmware version: {col()}{self.sfr_ver} ({self.sfr_build})")
         if self.fsfr_ver:
             p_info(f"  Fallback firmware version: {col()}{self.fsfr_ver} ({self.fsfr_build})")