test: just bind-mount target/boot in deploymnt/boot

Author: jbtrystram

crates/lib/src/bootloader.rs

@@ -103,21 +103,19 @@ pub(crate) fn install_via_bootupd(
     // let's bind mount it to a temp mountpoint under /run
     // so it gets carried over in the chroot.
 
-    let rootfs_mountpoint: TempDir;
+    // let rootfs_mountpoint: TempDir;
     let rootfs_mount = if rootfs.starts_with("/run") {
         rootfs.as_str()
     } else {
-        rootfs_mountpoint = tempfile::tempdir_in("/run")?;
-        rustix::mount::mount_bind_recursive(
-            rootfs.as_std_path(),
-            &rootfs_mountpoint.path().to_owned(),
-        )?;
-        rootfs_mountpoint
-            .path()
-            .to_str()
-            .expect("Invalid tempdir path")
+        "/"
     };
 
+    // rootfs_mountpoint
+    //     .path()
+    //     .to_str()
+    //     .expect("Invalid tempdir path")
+    //};
+
     // We mount the linux API file systems into the target deployment before chrooting
     // so bootupd can find the proper backing device.
     // xref https://systemd.io/API_FILE_SYSTEMS/
@@ -132,6 +130,21 @@ pub(crate) fn install_via_bootupd(
             tracing::debug!("bind mounting {}", dest.display());
             rustix::mount::mount_bind_recursive(src, dest)?;
         }
+        // WIP : let's try to bind-mount /target/boot into the deployment as well rather than bind-mounting the whole thing??
+        if !rootfs.starts_with("/run") {
+            tracing::debug!(
+                "We need to access the target /boot filesystem so let's also bind-mount it"
+            );
+            let trgt_boot = rootfs.as_std_path().join("boot");
+            let chrooted_boot = target_root.join_os("boot");
+            tracing::debug!(
+                "bind-mounting {} in {}",
+                &trgt_boot.display(),
+                &chrooted_boot.display()
+            );
+            rustix::mount::mount_bind_recursive(trgt_boot, chrooted_boot)?;
+        }
+
         // Append the `bootupctl` command, it will be passed as
         // an argument to chroot
         vec![target_root.as_str(), "bootupctl"]
@@ -164,6 +177,7 @@ pub(crate) fn install_via_bootupd(
 
     // Clean up the mounts after ourselves
     if let Some(target_root) = abs_deployment_path {
+        rustix::mount::unmount(target_root.join("boot"), UnmountFlags::DETACH);
         for dir in bind_mount_dirs {
             let mount = target_root
                 .join(dir.strip_prefix("/").unwrap())