efi: update install() and update() according to split change

Author: HuijingHei

src/blockdev.rs

@@ -23,6 +23,7 @@ pub fn get_devices<P: AsRef<Path>>(target_root: P) -> Result<Vec<String>> {
 }
 
 // Get single device for the target root
+#[allow(dead_code)]
 pub fn get_single_device<P: AsRef<Path>>(target_root: P) -> Result<String> {
     let mut devices = get_devices(&target_root)?.into_iter();
     let Some(parent) = devices.next() else {
@@ -37,7 +38,6 @@ pub fn get_single_device<P: AsRef<Path>>(target_root: P) -> Result<String> {
 
 /// Find esp partition on the same device
 /// using sfdisk to get partitiontable
-#[allow(dead_code)]
 pub fn get_esp_partition(device: &str) -> Result<Option<String>> {
     const ESP_TYPE_GUID: &str = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B";
     let device_info: PartitionTable = bootc_blockdev::partitions_of(Utf8Path::new(device))?;
@@ -51,21 +51,20 @@ pub fn get_esp_partition(device: &str) -> Result<Option<String>> {
     Ok(None)
 }
 
-/// Find all ESP partitions on the devices with mountpoint boot
-#[allow(dead_code)]
-pub fn find_colocated_esps<P: AsRef<Path>>(target_root: P) -> Result<Vec<String>> {
-    // first, get the parent device
-    let devices = get_devices(&target_root).with_context(|| "while looking for colocated ESPs")?;
-
-    // now, look for all ESPs on those devices
+/// Find all ESP partitions on the devices
+pub fn find_colocated_esps(devices: &Vec<String>) -> Result<Option<Vec<String>>> {
+    // look for all ESPs on those devices
     let mut esps = Vec::new();
     for device in devices {
         if let Some(esp) = get_esp_partition(&device)? {
             esps.push(esp)
         }
     }
+    if esps.is_empty() {
+        return Ok(None);
+    }
     log::debug!("Find esp partitions: {esps:?}");
-    Ok(esps)
+    Ok(Some(esps))
 }
 
 /// Find bios_boot partition on the same device
@@ -82,20 +81,18 @@ pub fn get_bios_boot_partition(device: &str) -> Result<Option<String>> {
     Ok(None)
 }
 
-/// Find all bios_boot partitions on the devices with mountpoint boot
-#[allow(dead_code)]
-pub fn find_colocated_bios_boot<P: AsRef<Path>>(target_root: P) -> Result<Vec<String>> {
-    // first, get the parent device
-    let devices =
-        get_devices(&target_root).with_context(|| "looking for colocated bios_boot parts")?;
-
-    // now, look for all bios_boot parts on those devices
+/// Find all bios_boot partitions on the devices
+pub fn find_colocated_bios_boot(devices: &Vec<String>) -> Result<Option<Vec<String>>> {
+    // look for all bios_boot parts on those devices
     let mut bios_boots = Vec::new();
     for device in devices {
         if let Some(bios) = get_bios_boot_partition(&device)? {
             bios_boots.push(bios)
         }
     }
+    if bios_boots.is_empty() {
+        return Ok(None);
+    }
     log::debug!("Find bios_boot partitions: {bios_boots:?}");
-    Ok(bios_boots)
+    Ok(Some(bios_boots))
 }

src/efi.rs

@@ -20,7 +20,7 @@ use walkdir::WalkDir;
 use widestring::U16CString;
 
 use crate::bootupd::RootContext;
-use crate::filetree;
+use crate::{blockdev, filetree};
 use crate::model::*;
 use crate::ostreeutil;
 use crate::util::{self, CommandRunExt};
@@ -306,7 +306,6 @@ impl Component for Efi {
         })
     }
 
-    // TODO: Remove dest_root; it was never actually used
     fn install(
         &self,
         src_root: &openat::Dir,
@@ -320,18 +319,22 @@ impl Component for Efi {
         log::debug!("Found metadata {}", meta.version);
         let srcdir_name = component_updatedirname(self);
         let ft = crate::filetree::FileTree::new_from_dir(&src_root.sub_dir(&srcdir_name)?)?;
-        let destdir = &self.ensure_mounted_esp(Path::new(dest_root))?;
-
-        let destd = &openat::Dir::open(destdir)
-            .with_context(|| format!("opening dest dir {}", destdir.display()))?;
+        // get esp device via /dev/disk/by-partlabel
+        let esp_device = self
+            .get_esp_device()
+            .ok_or_else(|| anyhow::anyhow!("Failed to find ESP device"))?;
+        let destpath = &self.ensure_mounted_esp(Path::new(dest_root), &esp_device)?;
+
+        let destd = &openat::Dir::open(destpath)
+            .with_context(|| format!("opening dest dir {}", destpath.display()))?;
         validate_esp(destd)?;
 
         // TODO - add some sort of API that allows directly setting the working
         // directory to a file descriptor.
         std::process::Command::new("cp")
             .args(["-rp", "--reflink=auto"])
             .arg(&srcdir_name)
-            .arg(destdir)
+            .arg(destpath)
             .current_dir(format!("/proc/self/fd/{}", src_root.as_raw_fd()))
             .run()?;
         if update_firmware {
@@ -355,15 +358,31 @@ impl Component for Efi {
             .filetree
             .as_ref()
             .ok_or_else(|| anyhow::anyhow!("No filetree for installed EFI found!"))?;
-        let sysroot = &sysroot.sysroot;
-        let updatemeta = self.query_update(sysroot)?.expect("update available");
-        let updated = sysroot
+        let sysroot_dir = &sysroot.sysroot;
+        let updatemeta = self.query_update(sysroot_dir)?.expect("update available");
+        let updated = sysroot_dir
             .sub_dir(&component_updatedirname(self))
             .context("opening update dir")?;
         let updatef = filetree::FileTree::new_from_dir(&updated).context("reading update dir")?;
-        let diff = currentf.diff(&updatef)?;
-        self.ensure_mounted_esp(Path::new("/"))?;
-        let destdir = self.open_esp().context("opening EFI dir")?;
+        let diff = currentf.diff(&updatef)?;       
+
+        let Some(esp_devices) = blockdev::find_colocated_esps(&sysroot.devices)? else {
+            anyhow::bail!("Failed to find all esp devices");
+        };
+        let mut devices = esp_devices.iter();
+        let Some(esp) = devices.next() else {
+            anyhow::bail!("Failed to find esp device");
+        };
+
+        if let Some(next_esp) = devices.next() {
+            anyhow::bail!(
+                "Found multiple esp devices {esp} and {next_esp}; not currently supported"
+            );
+        }
+        let destpath = &self.ensure_mounted_esp(sysroot.path.as_ref(), Path::new(&esp))?;
+
+        let destdir = &openat::Dir::open(&destpath.join("EFI"))
+            .with_context(|| format!("opening EFI dir {}", destpath.display()))?;
         validate_esp(&destdir)?;
         log::trace!("applying diff: {}", &diff);
         filetree::apply_diff(&updated, &destdir, &diff, None)