wip: pass in xbootldr to grub2 postinstall

Author: korewaChino

src/backend/custom.rs

@@ -156,8 +156,12 @@ pub fn install_custom(
     let efi = (mounttags.0.iter())
         .find(|part| part.mountpoint == std::path::Path::new("/boot/efi"))
         .and_then(|part| part.partition.to_str().map(ToOwned::to_owned));
+    let xbootldr = (mounttags.0.iter())
+        .find(|part| part.mountpoint == std::path::Path::new("/boot"))
+        .and_then(|part| part.partition.to_str().map(ToOwned::to_owned))
+        .ok_or_else(|| color_eyre::eyre::eyre!("cannot find xbootldr partition"))?;
 
-    container.run(|| state._inner_sys_setup(fstab, efi))??;
+    container.run(|| state._inner_sys_setup(fstab, efi, &xbootldr))??;
 
     Ok(())
 }

src/backend/install.rs

@@ -1,6 +1,7 @@
 use color_eyre::eyre::bail;
 use color_eyre::eyre::eyre;
 use color_eyre::eyre::Context;
+use color_eyre::eyre::ContextCompat;
 use color_eyre::{Result, Section};
 use ipc_channel::ipc::IpcError;
 use ipc_channel::ipc::IpcOneShotServer;
@@ -224,20 +225,22 @@ impl InstallationState {
 
         // todo: Also handle custom installs? Needs more information
         let esp_node = check_uefi().then(|| output.get_esp_partition()).flatten();
+        let xbootldr_node = output.get_xbootldr_partition().context("No xbootldr partition found")?;
 
-        container.run(|| self._inner_sys_setup(fstab, esp_node))??;
+        container.run(|| self._inner_sys_setup(fstab, esp_node, &xbootldr_node))??;
 
         Ok(())
     }
 
     #[allow(clippy::unwrap_in_result)]
     #[tracing::instrument]
-    pub fn _inner_sys_setup(&self, fstab: String, esp_node: Option<String>) -> Result<()> {
+    pub fn _inner_sys_setup(&self, fstab: String, esp_node: Option<String>, xbootldr_node: &str) -> Result<()> {
         // We will run the specified postinstall modules now
         let context = crate::backend::postinstall::Context {
             destination_disk: self.destination_disk.as_ref().unwrap().devpath.clone(),
             uefi: util::sys::check_uefi(),
             esp_partition: esp_node,
+            xbootldr_partition: xbootldr_node.to_owned(),
             lang: self.langlocale.clone().unwrap_or_else(|| "C.UTF-8".into()),
         };
 

src/backend/postinstall/grub2.rs

@@ -145,9 +145,19 @@ impl PostInstallModule for GRUB2 {
 
             stage!("Generating stage 1 grub.cfg in ESP..." {
                 let mut grub_cfg = std::fs::File::create("/boot/efi/EFI/fedora/grub.cfg")?;
-                // let's search for an xbootldr label
-                // because we never know what the device will be
-                // see the compile time included config file
+                let xbootldr_disk = &context.xbootldr_partition;
+                
+                let mut template_str = include_str!("../../../templates/fedora-grub.cfg");
+                // We used to blindly search for a partition labeled `xbootldr` here, but now that's not scalable.
+                // now that we are starting to support custom partitioning.
+                // So, now let's get the UUID of the xbootldr partition!
+                
+                
+                // todo: merge https://github.com/FyraLabs/lsblk-rs/pull/16
+                let xbootldr_uuid: &str = todo!();
+                
+                template_str.replace("$UUID$", xbootldr_uuid);
+                
                 grub_cfg.write_all(include_bytes!("../../../templates/fedora-grub.cfg"))?;
             });
 

src/backend/postinstall/mod.rs

@@ -26,6 +26,8 @@ pub struct Context {
     pub destination_disk: PathBuf,
     pub uefi: bool,
     pub esp_partition: Option<String>,
+    // Installs should always have an xbootldr partition
+    pub xbootldr_partition: String,
     pub lang: String,
 }
 

src/backend/repart_output.rs

@@ -81,6 +81,13 @@ impl RepartOutput {
             .find(|part| part.part_type == "esp")
             .map(|part| part.node.clone())
     }
+    
+    pub fn get_xbootldr_partition(&self) -> std::option::Option<String> {
+        self.partitions
+            .iter()
+            .find(|part| part.part_type == "xbootldr")
+            .map(|part| part.node.clone())
+    }
 
     /// Create `tiffin::Container` from the repartitioning output with the mountpoints
     /// from the DDI partition types

templates/fedora-grub.cfg

@@ -1,5 +1,5 @@
-search --no-floppy --label --set=dev xbootldr
+search --no-floppy --fs-uuid --set=dev $UUID$
 set prefix=($dev)/grub2
 
 export $prefix
-configfile $prefix/grub.cfg
+configfile $prefix/grub.cfg