chore: copy loader.conf to /boot/loader/ if present in bootupd config dir

Author: p5

src/main.rs

@@ -46,8 +46,8 @@ mod model_legacy;
 mod ostreeutil;
 mod packagesystem;
 mod sha512string;
-mod util;
 mod systemd_boot_configs;
+mod util;
 
 use clap::crate_name;
 

src/systemd_boot_configs.rs

@@ -1,18 +1,18 @@
+use std::path::Path;
+
 use anyhow::{bail, Context, Result};
 use fn_error_context::context;
 use log::warn;
 
 /// Install the systemd-boot entry files
 #[context("Installing systemd-boot entries")]
-pub(crate) fn install(
-    target_root: &openat::Dir,   // This should be mounted ESP root dir (not /boot inside ESP)
-    _write_uuid: bool,
-) -> Result<()> {
+pub(crate) fn install(esp_path: &openat::Dir, _write_uuid: bool) -> Result<()> {
+    let esp_path = esp_path.recover_path().context("ESP path is not valid")?;
     let status = std::process::Command::new("bootctl")
         .args([
             "install",
             "--esp-path",
-            target_root.recover_path()?.to_str().context("ESP path is not valid UTF-8")?,
+            esp_path.to_str().context("ESP path is not valid UTF-8")?,
         ])
         .status()
         .context("running  install")?;
@@ -21,50 +21,21 @@ pub(crate) fn install(
         bail!("bootctl install failed with status: {}", status);
     }
 
+    // If loader.conf is present in /usr/lib/bootupd/systemd-boot/loader.conf, copy it over
+    let src_loader_conf = "/usr/lib/bootupd/systemd-boot/loader.conf";
+    let dst_loader_conf = Path::new(&esp_path).join("loader/loader.conf");
+    if Path::new(src_loader_conf).exists() {
+        std::fs::copy(src_loader_conf, &dst_loader_conf).context(format!(
+            "Copying {} to {}",
+            src_loader_conf,
+            dst_loader_conf.display()
+        ))?;
+        warn!(
+            "Copied \"{}\" to \"{}\".",
+            src_loader_conf,
+            dst_loader_conf.display()
+        );
+    }
+
     Ok(())
 }
-
-// use anyhow::{Context, Result};
-// use fn_error_context::context;
-// use log::warn;
-// use std::fs;
-// use std::path::Path;
-
-// /// Install the systemd-boot entry files
-// #[context("Installing systemd-boot entries")]
-// pub(crate) fn install(
-//     target_root: &openat::Dir,   // This should be mounted ESP root dir (not /boot inside ESP)
-//     _write_uuid: bool,
-// ) -> Result<()> {
-//     let esp_path = target_root.recover_path()?.to_str().context("ESP path is not valid UTF-8")?.to_string();
-
-//     let dirs = [
-//         "EFI/systemd",
-//         "EFI/BOOT",
-//         "loader",
-//         "loader/keys",
-//         "loader/entries",
-//         "EFI/Linux",
-//     ];
-//     for dir in dirs.iter() {
-//         let full_path = Path::new(&esp_path).join(dir);
-//         if !full_path.exists() {
-//             fs::create_dir_all(&full_path).context(format!("Creating {}", full_path.display()))?;
-//             warn!("Created \"{}\".", full_path.display());
-//         }
-//     }
-
-//     let src_efi = "/usr/lib/systemd/boot/efi/systemd-bootx64.efi";
-//     let dst_systemd = Path::new(&esp_path).join("EFI/systemd/systemd-bootx64.efi");
-//     let dst_boot = Path::new(&esp_path).join("EFI/BOOT/BOOTX64.EFI");
-
-//     fs::copy(src_efi, &dst_systemd)
-//         .context(format!("Copying {} to {}", src_efi, dst_systemd.display()))?;
-//     warn!("Copied \"{}\" to \"{}\".", src_efi, dst_systemd.display());
-
-//     fs::copy(src_efi, &dst_boot)
-//         .context(format!("Copying {} to {}", src_efi, dst_boot.display()))?;
-//     warn!("Copied \"{}\" to \"{}\".", src_efi, dst_boot.display());
-
-//     Ok(())
-// }

tmp/Containerfile

@@ -7,6 +7,7 @@ RUN dnf install -y \
     tree
 
 COPY bootupctl /usr/bin/bootupctl
+# COPY loader.conf /usr/lib/bootupd/systemd-boot/loader.conf
 
 RUN set -x && \
     KVER=$(rpm -q --qf '%{version}-%{release}.%{arch}\n' kernel | head -n 1) && \