main: Support generic in-place step2 with pairing

This will fail for 11.x, but we haven't supported that in forever. Trust
bputil to know about pairing, and allow in-place step2. This is useful
for resuming/repairing installs from recoveryOS booted as paired, and
eventually also for m1n1 updates.

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

Author: marcan

src/main.py

@@ -27,7 +27,6 @@ class IPSW:
     min_macos: str
     min_iboot: str
     min_sfr: str
-    paired_sfr: bool
     expert_only: bool
     url: str
 
@@ -65,23 +64,20 @@ class Device:
          "12.1",
          "iBoot-7429.61.2",
          "21.3.52.0.0,0",
-         False,
          True,
          "https://updates.cdn-apple.com/2021FCSWinter/fullrestores/002-42433/F3F6D5CD-67FE-449C-9212-F7409808B6C4/UniversalMac_12.1_21C52_Restore.ipsw"),
     # This is the special M2 version, it comes ahead so it isn't the default in expert mode
     IPSW("12.4",
          "12.1",
          "iBoot-7459.101.3",
          "21.6.81.2.0,0",
-         False,
          True,
          "https://updates.cdn-apple.com/2022SpringFCS/fullrestores/012-17781/F045A95A-44B4-4BA9-8A8A-919ECCA2BB31/UniversalMac_12.4_21F2081_Restore.ipsw"),
     IPSW("12.3",
          "12.1",
          "iBoot-7459.101.2",
          "21.5.230.0.0,0",
          False,
-         False,
          "https://updates.cdn-apple.com/2022SpringFCS/fullrestores/071-08757/74A4F2A1-C747-43F9-A22A-C0AD5FB4ECB6/UniversalMac_12.3_21E230_Restore.ipsw"),
 ]
 
@@ -462,8 +458,7 @@ def step2(self):
         bootpicker_works = sys_ver >= (12, 3)
         if not bootpicker_works and self.ipsw:
             bootpicker_works = sys_ver >= split_ver(self.ipsw.min_macos)
-
-        if is_1tr and self.is_sfr_recovery and self.ipsw.paired_sfr:
+        if is_1tr and self.osi.paired:
             subprocess.run([self.ins.step2_sh], check=True)
             self.startup_disk(recovery=True, volume_blessed=True, reboot=True)
         elif is_recovery:

src/osenum.py

@@ -23,6 +23,7 @@ class OSInfo:
     recovery: object = None
     rec_vgid: str = None
     bp: object = None
+    paired: bool = False
     admin_users: object = None
 
     def __str__(self):
@@ -208,6 +209,9 @@ def collect_os(self, part, volumes, vgid):
                 osi.m1n1_ver = fuos.split(b"##m1n1_ver##")[1].split(b"\0")[0].decode("ascii")
                 logging.info(f"  m1n1 version found: {osi.m1n1_ver}")
 
+        if b": Paired" in bps:
+            osi.paired = True
+
         return osi
 
     def bputil(self, *args):