move filtering of disks with mounted partitions to client side

canonical · Jul 19, 2023 · 9d050d4 · 9d050d4
1 parent 37a4a76
commit 9d050d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/subiquity/models/filesystem.py b/subiquity/models/filesystem.py
@@ -1261,19 +1261,6 @@ def process_probe_data(self):
                 work.extend(dependencies(o))
             mounts.extend(mount.get('children', []))
 
-        # For now we mark anything that can be reached from a mounted
-        # partition (e.g. an unused partition on the install drive) as
-        # part of the install media.
-        work = [
-            o
-            for o in self._actions
-            if getattr(o, '_has_in_use_partition', False)
-            ]
-        while work:
-            o = work.pop(0)
-            o._is_in_use = True
-            work.extend(reverse_dependencies(o))
-
         # This is a special hack for the install media. When written to a USB
         # stick or similar, both the block device for the whole drive and for
         # the partition will show up as having a filesystem. Casper should
@@ -1620,11 +1607,7 @@ def can_emit(obj):
         log.debug('mountpoints %s', mountpoints)
 
         if mode == ActionRenderMode.FOR_API:
-            work = [
-                a
-                for a in self._actions
-                if not getattr(a, '_is_in_use', False)
-                ]
+            work = list(self._actions)
         else:
             work = [
                 a for a in self._actions if not getattr(a, 'preserve', False)

diff --git a/subiquity/ui/views/filesystem/filesystem.py b/subiquity/ui/views/filesystem/filesystem.py
@@ -66,6 +66,7 @@
 from subiquity.common.filesystem import boot, gaps, labels
 from subiquity.models.filesystem import (
     humanize_size,
+    Disk,
     )
 
 from .delete import ConfirmDeleteStretchy, ConfirmReformatStretchy
@@ -376,8 +377,9 @@ def _action_menu_for_device(self, device):
     def refresh_model_inputs(self):
         devices = [
             d for d in self.parent.model.all_devices()
-            if (d.available() == self.show_available
+            if ((d.available() == self.show_available
                 or (not self.show_available and d.has_unavailable_partition()))
+                and (not isinstance(d, Disk) or not d._has_in_use_partition))
         ]
         if len(devices) == 0:
             self._w = Padding.push_2(self._no_devices_content)