install: only preserve loader directory on ostree

On none ostree directory, the loader is directory that needs to be
removed.

Author: HuijingHei

crates/lib/src/install.rs

@@ -1889,7 +1889,7 @@ fn remove_all_in_dir_no_xdev(d: &Dir, mount_err: bool) -> Result<()> {
 }
 
 #[context("Removing boot directory content except loader dir")]
-fn remove_all_except_loader_dirs(bootdir: &Dir) -> Result<()> {
+fn remove_all_except_loader_dirs(bootdir: &Dir, is_ostree: bool) -> Result<()> {
     let entries = bootdir
         .entries()
         .context("Reading boot directory entries")?;
@@ -1903,13 +1903,14 @@ fn remove_all_except_loader_dirs(bootdir: &Dir) -> Result<()> {
             anyhow::bail!("Invalid non-UTF8 filename: {file_name:?} in /boot");
         };
 
-        // Skip any entry that starts with a protected prefix,
-        // as we also need to protect loader.0 or loader.1
-        if file_name.starts_with("loader") {
-            continue;
+        let etype = entry.file_type()?;
+        // Only preserve loader directory on ostree
+        if is_ostree {
+            if file_name.starts_with("loader") {
+                continue;
+            }
         }
 
-        let etype = entry.file_type()?;
         if etype == FileType::dir() {
             // Open the directory and remove its contents
             if let Some(subdir) = bootdir.open_dir_noxdev(&file_name)? {
@@ -1926,12 +1927,13 @@ fn remove_all_except_loader_dirs(bootdir: &Dir) -> Result<()> {
 }
 
 #[context("Removing boot directory content")]
-fn clean_boot_directories(rootfs: &Dir) -> Result<()> {
+fn clean_boot_directories(rootfs: &Dir, is_ostree: bool) -> Result<()> {
     let bootdir =
         crate::utils::open_dir_remount_rw(rootfs, BOOT.into()).context("Opening /boot")?;
 
     // This should not remove /boot/efi note.
-    remove_all_except_loader_dirs(&bootdir).context("Emptying /boot but preserve loader")?;
+    remove_all_except_loader_dirs(&bootdir, is_ostree)
+        .context("Emptying /boot but preserve loader")?;
 
     // TODO: Discover the ESP the same way bootupd does it; we should also
     // support not wiping the ESP.
@@ -2145,7 +2147,9 @@ pub(crate) async fn install_to_filesystem(
             tokio::task::spawn_blocking(move || remove_all_in_dir_no_xdev(&rootfs_fd, true))
                 .await??;
         }
-        Some(ReplaceMode::Alongside) => clean_boot_directories(&target_rootfs_fd)?,
+        Some(ReplaceMode::Alongside) => {
+            clean_boot_directories(&target_rootfs_fd, is_already_ostree)?
+        }
         None => require_empty_rootdir(&rootfs_fd)?,
     }