install: Define GUIDs globally

To ensure we build without the to-disk feature.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

crates/lib/src/install.rs

@@ -26,7 +26,6 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::{anyhow, ensure, Context, Result};
-use baseline::{DPS_UUID, ESP_GUID};
 use bootc_blockdev::{find_parent_devices, PartitionTable};
 use bootc_utils::CommandRunExt;
 use camino::Utf8Path;
@@ -104,6 +103,8 @@ const SELINUXFS: &str = "/sys/fs/selinux";
 /// The mount path for uefi
 const EFIVARFS: &str = "/sys/firmware/efi/efivars";
 pub(crate) const ARCH_USES_EFI: bool = cfg!(any(target_arch = "x86_64", target_arch = "aarch64"));
+pub(crate) const ESP_GUID: &str = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B";
+pub(crate) const DPS_UUID: &str = "6523f8ae-3eb1-4e2a-a05a-18b695ae656f";
 
 const DEFAULT_REPO_CONFIG: &[(&str, &str)] = &[
     // Default to avoiding grub2-mkconfig etc.
@@ -615,6 +616,7 @@ impl FromStr for MountSpec {
     }
 }
 
+#[cfg(feature = "install-to-disk")]
 impl InstallToDiskOpts {
     pub(crate) fn validate(&self) -> Result<()> {
         if !self.composefs_native {

crates/lib/src/install/baseline.rs

@@ -42,9 +42,6 @@ pub(crate) const LINUX_PARTTYPE: &str = "0FC63DAF-8483-4772-8E79-3D69D8477DE4";
 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";
-pub(crate) const DPS_UUID: &str = "6523f8ae-3eb1-4e2a-a05a-18b695ae656f";
 
 #[derive(clap::ValueEnum, Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
@@ -281,7 +278,7 @@ pub(crate) fn install_create_rootfs(
     }
 
     let esp_partno = if super::ARCH_USES_EFI {
-        let esp_guid = ESP_GUID;
+        let esp_guid = crate::install::ESP_GUID;
         partno += 1;
         writeln!(
             &mut partitioning_buf,
@@ -411,7 +408,7 @@ pub(crate) fn install_create_rootfs(
         opts.wipe,
         mkfs_options.iter().copied(),
         // TODO: Add cli option for this
-        Some(uuid::uuid!(DPS_UUID)),
+        Some(uuid::uuid!(crate::install::DPS_UUID)),
     )?;
     let rootarg = format!("root=UUID={root_uuid}");
     let bootsrc = boot_uuid.as_ref().map(|uuid| format!("UUID={uuid}"));