Merge pull request #1006 from HuijingHei/fix-multipath

efi: Get the correct esp on multipath when install

Author: HuijingHei

src/blockdev.rs

@@ -1,4 +1,4 @@
-use camino::Utf8Path;
+use camino::{Utf8Path, Utf8PathBuf};
 use std::path::Path;
 
 use anyhow::{Context, Result};
@@ -99,3 +99,46 @@ pub fn find_colocated_bios_boot(devices: &Vec<String>) -> Result<Option<Vec<Stri
     log::debug!("Found bios_boot partitions: {bios_boots:?}");
     Ok(Some(bios_boots))
 }
+
+// Check if the device is mpath
+fn is_mpath(device: &str) -> Result<bool> {
+    let dm_path = Utf8PathBuf::from_path_buf(std::fs::canonicalize(device)?)
+        .map_err(|_| anyhow::anyhow!("Non-UTF8 path"))?;
+    let dm_name = dm_path.file_name().unwrap_or("");
+    let uuid_path = Utf8PathBuf::from(format!("/sys/class/block/{dm_name}/dm/uuid"));
+
+    if uuid_path.exists() {
+        let uuid = std::fs::read_to_string(&uuid_path)
+            .with_context(|| format!("Failed to read {uuid_path}"))?;
+        if uuid.trim_start().starts_with("mpath-") {
+            return Ok(true);
+        }
+    }
+    Ok(false)
+}
+
+/// Get esp partition number from device
+pub fn get_esp_partition_number(device: &str) -> Result<String> {
+    let esp_device =
+        get_esp_partition(device)?.ok_or_else(|| anyhow::anyhow!("Failed to find ESP device"))?;
+
+    let devname = esp_device
+        .rsplit_once('/')
+        .ok_or_else(|| anyhow::anyhow!("Failed to parse {esp_device}"))?
+        .1;
+
+    let partition_path = Utf8PathBuf::from(format!("/sys/class/block/{devname}/partition"));
+    if partition_path.exists() {
+        return std::fs::read_to_string(&partition_path)
+            .with_context(|| format!("Failed to read {partition_path}"));
+    }
+
+    // On multipath the partition attribute is not existing
+    if is_mpath(device)? {
+        if let Some(esp) = esp_device.strip_prefix(device) {
+            let esp_num = esp.trim_start_matches(|c: char| !c.is_ascii_digit());
+            return Ok(esp_num.to_string());
+        }
+    }
+    anyhow::bail!("Not supported for {device}")
+}

src/efi.rs

@@ -162,12 +162,22 @@ impl Efi {
             return Ok(());
         }
 
+        // Check shim exists and return earlier if not
+        let shim_path = format!("EFI/{vendordir}/{SHIM}");
+        if !espdir.exists(&shim_path)? {
+            anyhow::bail!("Failed to find {shim_path}");
+        }
+        let loader = format!("\\EFI\\{vendordir}\\{SHIM}");
+
         let product_name = get_product_name(&sysroot)?;
         log::debug!("Get product name: '{product_name}'");
         assert!(product_name.len() > 0);
+
+        let esp_part_num = blockdev::get_esp_partition_number(device)?;
+
         // clear all the boot entries that match the target name
         clear_efi_target(&product_name)?;
-        create_efi_boot_entry(device, espdir, vendordir, &product_name)
+        create_efi_boot_entry(device, esp_part_num.trim(), &loader, &product_name)
     }
 }
 
@@ -669,34 +679,20 @@ pub(crate) fn clear_efi_target(target: &str) -> Result<()> {
 #[context("Adding new EFI boot entry")]
 pub(crate) fn create_efi_boot_entry(
     device: &str,
-    espdir: &openat::Dir,
-    vendordir: &str,
+    esp_partition_number: &str,
+    loader: &str,
     target: &str,
 ) -> Result<()> {
-    let fsinfo = crate::filesystem::inspect_filesystem(espdir, ".")?;
-    let source = fsinfo.source;
-    let devname = source
-        .rsplit_once('/')
-        .ok_or_else(|| anyhow::anyhow!("Failed to parse {source}"))?
-        .1;
-    let partition_path = format!("/sys/class/block/{devname}/partition");
-    let partition_number = std::fs::read_to_string(&partition_path)
-        .with_context(|| format!("Failed to read {partition_path}"))?;
-    let shim = format!("{vendordir}/{SHIM}");
-    if espdir.exists(&shim)? {
-        anyhow::bail!("Failed to find {SHIM}");
-    }
-    let loader = format!("\\EFI\\{}\\{SHIM}", vendordir);
     log::debug!("Creating new EFI boot entry using '{target}'");
     let mut cmd = Command::new(EFIBOOTMGR);
     cmd.args([
         "--create",
         "--disk",
         device,
         "--part",
-        partition_number.trim(),
+        esp_partition_number,
         "--loader",
-        loader.as_str(),
+        loader,
         "--label",
         target,
     ]);