install: run bootupctl update if detecting bootupd on ostree

Signed-off-by: Huijing Hei <[email protected]>

Author: HuijingHei

crates/lib/src/bootloader.rs

@@ -70,6 +70,17 @@ pub(crate) fn install_via_bootupd(
         .run_inherited_with_cmd_context()
 }
 
+#[context("Updating bootloader")]
+pub(crate) fn update_via_bootupd() -> Result<()> {
+    let verbose = std::env::var_os("BOOTC_BOOTLOADER_DEBUG").map(|_| "-vvvv");
+    println!("Updating bootloader via bootupd");
+    Command::new("bootupctl")
+        .args(["update"])
+        .args(verbose)
+        .log_debug()
+        .run_inherited_with_cmd_context()
+}
+
 #[context("Installing bootloader")]
 pub(crate) fn install_systemd_boot(
     device: &PartitionTable,

crates/lib/src/install.rs

@@ -1843,11 +1843,11 @@ fn clean_boot_directories(rootfs: &Dir, is_ostree: bool) -> Result<()> {
         crate::utils::open_dir_remount_rw(rootfs, BOOT.into()).context("Opening /boot")?;
 
     if is_ostree {
-        // On ostree systems, the boot directory already has our desired format, we should only
-        // remove the bootupd-state.json file to avoid bootupctl complaining it already exists.
-        bootdir
-            .remove_file_optional("bootupd-state.json")
-            .context("removing bootupd-state.json")?;
+        if bootdir.exists("bootupd-state.json") {
+            // On ostree systems with bootupd, should running bootupctl update.
+            crate::bootloader::update_via_bootupd()?;
+        }
+        // TODO: handle with no bootupd
     } else {
         // This should not remove /boot/efi note.
         remove_all_in_dir_no_xdev(&bootdir, false).context("Emptying /boot")?;