mount rp at predictable path and leave it mounted

I have a use case for wanting to manipulate the rp contents in a late-command.
canonical · Jul 25, 2023 · 3e2c8be · 3e2c8be
1 parent 2a8f1cf
commit 3e2c8be
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/subiquity/server/controllers/install.py b/subiquity/server/controllers/install.py
@@ -395,13 +395,14 @@ async def run_curtin_step(name, stages, step_config, source=None):
         rp = fs_controller.reset_partition
         if rp is not None:
             mounter = Mounter(self.app)
-            async with mounter.mounted(rp.path) as mp:
-                await run_curtin_step(
-                    name="populate recovery",
-                    stages=["extract"],
-                    step_config=self.rp_config(logs_dir, mp.p()),
-                    source="cp:///cdrom",
-                )
+            rp_target = os.path.join(self.app.root, "factory-reset")
+            mp = await mounter.mount(rp.path, mountpoint=rp_target)
+            await run_curtin_step(
+                name="populate recovery",
+                stages=["extract"],
+                step_config=self.rp_config(logs_dir, mp.p()),
+                source="cp:///cdrom",
+            )
             await self.create_rp_boot_entry(context=context, rp=rp)
 
     @with_context(description="creating boot entry for reset partition")