install zfsutils-linux if needed

subiquity/models/filesystem.py

@@ -1275,6 +1275,7 @@ def __init__(self, bootloader=None):
         self.storage_version = 1
         self._probe_data = None
         self.dd_target: Optional[Disk] = None
+        self.reset_partition: Optional[Partition] = None
         self.reset()
 
     def reset(self):
@@ -2037,3 +2038,11 @@ def add_zpool(
         )
         self._actions.append(zpool)
         return zpool
+
+    async def live_packages(self):
+        r = []
+        if self.reset_partition is not None:
+            r.append("efibootmgr")
+        if self._one(type="zpool") is not None:
+            r.append("zfsutils-linux")
+        return r

subiquity/models/subiquity.py

@@ -390,6 +390,14 @@ async def target_packages(self):
                 packages.extend(await meth())
         return packages
 
+    async def live_packages(self):
+        packages = []
+        for model_name in self._install_model_names.all():
+            meth = getattr(getattr(self, model_name), "live_packages", None)
+            if meth is not None:
+                packages.extend(await meth())
+        return packages
+
     def _cloud_init_files(self):
         # TODO, this should be moved to the in-target cloud-config seed so on
         # first boot of the target, it reconfigures datasource_list to none

subiquity/server/controllers/filesystem.py

@@ -62,9 +62,7 @@
     ArbitraryDevice,
 )
 from subiquity.models.filesystem import Disk as ModelDisk
-from subiquity.models.filesystem import MiB
-from subiquity.models.filesystem import Partition as ModelPartition
-from subiquity.models.filesystem import Raid, _Device, align_down, align_up
+from subiquity.models.filesystem import MiB, Raid, _Device, align_down, align_up
 from subiquity.server import snapdapi
 from subiquity.server.controller import SubiquityController
 from subiquity.server.mounter import Mounter
@@ -244,7 +242,6 @@ def __init__(self, app):
         # If probe data come in while we are doing partitioning, store it in
         # this variable. It will be picked up on next reset.
         self.queued_probe_data: Optional[Dict[str, Any]] = None
-        self.reset_partition: Optional[ModelPartition] = None
         self.reset_partition_only: bool = False
 
     def is_core_boot_classic(self):
@@ -635,7 +632,7 @@ async def guided(
                 reset_size = int(cp.stdout.strip().split()[0])
                 reset_size = align_up(int(reset_size * 1.10), 256 * MiB)
             reset_gap, gap = gap.split(reset_size)
-            self.reset_partition = self.create_partition(
+            self.model.reset_partition = self.create_partition(
                 device=reset_gap.device,
                 gap=reset_gap,
                 spec={"fstype": "fat32"},

subiquity/server/controllers/install.py

@@ -413,7 +413,7 @@ async def run_curtin_step(name, stages, step_config, source=None):
             # really write recovery_system={snapd_system_label} to
             # {target}/var/lib/snapd/modeenv to get snapd to pick it up on
             # first boot. But not needed for now.
-        rp = fs_controller.reset_partition
+        rp = fs_controller.model.reset_partition
         if rp is not None:
             mounter = Mounter(self.app)
             rp_target = os.path.join(self.app.root, "factory-reset")
@@ -597,6 +597,11 @@ async def create_core_boot_classic_fstab(self, *, context):
         with open(self.tpath("etc/fstab"), "w") as fp:
             fp.write("/run/mnt/ubuntu-boot/EFI/ubuntu /boot/grub none bind\n")
 
+    @with_context(description="installing packages to live system")
+    async def install_live_packages(self, *, context):
+        for package in await self.model.live_packages():
+            await self.app.package_installer.install_pkg(package)
+
     @with_context()
     async def install(self, *, context):
         context.set("is-install-context", True)
@@ -627,8 +632,7 @@ async def install(self, *, context):
                 fsc = self.app.controllers.Filesystem
                 for_install_path = self.model.source.get_source(fsc._info.name)
 
-            if self.app.controllers.Filesystem.reset_partition:
-                self.app.package_installer.start_installing_pkg("efibootmgr")
+            await self.install_live_packages()
 
             if self.model.target is not None:
                 if os.path.exists(self.model.target):