Merge pull request #1106 from cgwalters/depend-updated-bootupd

bootloader: Always pass full path to bootupd

Author: cgwalters

lib/src/bootloader.rs

@@ -1,41 +1,12 @@
 use anyhow::{anyhow, bail, Context, Result};
-use camino::{Utf8Path, Utf8PathBuf};
+use camino::Utf8Path;
 use fn_error_context::context;
 
 use crate::task::Task;
 use bootc_blockdev::PartitionTable;
 
 /// The name of the mountpoint for efi (as a subdirectory of /boot, or at the toplevel)
 pub(crate) const EFI_DIR: &str = "efi";
-#[cfg(feature = "install-to-disk")]
-pub(crate) const ESP_GUID: &str = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B";
-#[cfg(feature = "install-to-disk")]
-pub(crate) const PREPBOOT_GUID: &str = "9E1A2D38-C612-4316-AA26-8B49521E5A8B";
-#[cfg(feature = "install-to-disk")]
-pub(crate) const PREPBOOT_LABEL: &str = "PowerPC-PReP-boot";
-#[cfg(target_arch = "powerpc64")]
-/// We make a best-effort to support MBR partitioning too.
-pub(crate) const PREPBOOT_MBR_TYPE: &str = "41";
-
-/// Find the device to pass to bootupd. Only on powerpc64 right now
-/// we explicitly find one with a specific label.
-///
-/// This should get fixed once we execute on https://github.com/coreos/bootupd/issues/432
-fn get_bootupd_device(device: &PartitionTable) -> Result<Utf8PathBuf> {
-    #[cfg(target_arch = "powerpc64")]
-    {
-        return device
-            .partitions
-            .iter()
-            .find(|p| matches!(p.parttype.as_str(), PREPBOOT_GUID | PREPBOOT_MBR_TYPE))
-            .ok_or_else(|| {
-                anyhow::anyhow!("Failed to find PReP partition with GUID {PREPBOOT_GUID}")
-            })
-            .map(|dev| dev.node.as_str().into());
-    }
-    #[cfg(not(target_arch = "powerpc64"))]
-    return Ok(device.path().into());
-}
 
 #[context("Installing bootloader")]
 pub(crate) fn install_via_bootupd(
@@ -47,7 +18,7 @@ pub(crate) fn install_via_bootupd(
     // bootc defaults to only targeting the platform boot method.
     let bootupd_opts = (!configopts.generic_image).then_some(["--update-firmware", "--auto"]);
 
-    let devpath = get_bootupd_device(device)?;
+    let devpath = device.path();
     let args = ["backend", "install", "--write-uuid"]
         .into_iter()
         .chain(verbose)

lib/src/install/baseline.rs

@@ -37,6 +37,12 @@ pub(crate) const BOOTPN_SIZE_MB: u32 = 510;
 pub(crate) const EFIPN_SIZE_MB: u32 = 512;
 /// The GPT type for "linux"
 pub(crate) const LINUX_PARTTYPE: &str = "0FC63DAF-8483-4772-8E79-3D69D8477DE4";
+#[cfg(feature = "install-to-disk")]
+pub(crate) const PREPBOOT_GUID: &str = "9E1A2D38-C612-4316-AA26-8B49521E5A8B";
+#[cfg(feature = "install-to-disk")]
+pub(crate) const PREPBOOT_LABEL: &str = "PowerPC-PReP-boot";
+#[cfg(feature = "install-to-disk")]
+pub(crate) const ESP_GUID: &str = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B";
 
 #[derive(clap::ValueEnum, Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
@@ -257,8 +263,8 @@ pub(crate) fn install_create_rootfs(
     } else if cfg!(target_arch = "powerpc64") {
         // PowerPC-PReP-boot
         partno += 1;
-        let label = crate::bootloader::PREPBOOT_LABEL;
-        let uuid = crate::bootloader::PREPBOOT_GUID;
+        let label = PREPBOOT_LABEL;
+        let uuid = PREPBOOT_GUID;
         writeln!(
             &mut partitioning_buf,
             r#"size=4MiB, bootable, type={uuid}, name="{label}""#
@@ -270,7 +276,7 @@ pub(crate) fn install_create_rootfs(
     }
 
     let esp_partno = if super::ARCH_USES_EFI {
-        let esp_guid = crate::bootloader::ESP_GUID;
+        let esp_guid = ESP_GUID;
         partno += 1;
         writeln!(
             &mut partitioning_buf,