osenum: Recognize partitions attached to a Linux install

This is the first step towards an "uninstall" option, but also useful
for repair actions.

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

Author: marcan

src/main.py

@@ -908,6 +908,7 @@ def main_loop(self):
         oses_upgradable = []
 
         for i, p in enumerate(self.parts):
+            p.index = i
             if p.type in ("Apple_APFS_ISC",):
                 continue
             if p.free:
@@ -977,6 +978,8 @@ def main_loop(self):
                 else:
                     state += " "
                 p_plain(f"    OS: [{state}] {os}")
+                if os.attached_partitions:
+                    p_plain(f"      Extra partitions: {' '.join('#' + str(i.index) for i in os.attached_partitions)}")
                 if os.stub and os.m1n1_ver and os.m1n1_ver != self.m1n1_ver:
                     oses_upgradable.append((p, os))
                 elif os.stub and not (os.bp and os.bp.get("coih", None)):

src/osenum.py

@@ -27,6 +27,7 @@ class OSInfo:
     bp: object = None
     paired: bool = False
     admin_users: object = None
+    attached_partitions: list = None
 
     def update_admin_users(self):
         try:
@@ -75,6 +76,26 @@ def collect(self, parts):
             else:
                 self.collect_part(p)
 
+        for i, p in enumerate(parts):
+            if len(p.os) != 1:
+                continue
+            os = p.os[0]
+            if not os.stub:
+                continue
+            try:
+                efi = parts[i + 1]
+            except IndexError:
+                continue
+
+            if efi.type != "EFI":
+                continue
+            os.attached_partitions = [efi]
+            for j in range(i + 2, min(len(parts), i + 5)):
+                q = parts[j]
+                if q.type != "Linux Filesystem":
+                    continue
+                os.attached_partitions.append(q)
+
     def collect_recovery(self, part):
         logging.info(f"OSEnum.collect_recovery(part={part.name})")
         if part.container is None: