Fix build errors due to rebase

Author: jasoncouture

src/bios/mod.rs

@@ -1,9 +1,8 @@
 use std::path::Path;
 
-use crate::DiskImageBuilder;
+use bootloader_boot_config::BootConfig;
 
-const BIOS_STAGE_3: &str = "boot-stage-3";
-const BIOS_STAGE_4: &str = "boot-stage-4";
+use crate::DiskImageBuilder;
 
 /// Create disk images for booting on legacy BIOS systems.
 pub struct BiosBoot {
@@ -18,12 +17,18 @@ impl BiosBoot {
         }
     }
 
-    /// Add a ramdisk file to the image
+    /// Add a ramdisk file to the image.
     pub fn set_ramdisk(&mut self, ramdisk_path: &Path) -> &mut Self {
         self.image_builder.set_ramdisk(ramdisk_path);
         self
     }
 
+    /// Creates a configuration file (boot.json) that configures the runtime behavior of the bootloader.
+    pub fn set_boot_config(&mut self, config: &BootConfig) -> &mut Self {
+        self.image_builder.set_boot_config(config);
+        self
+    }
+
     /// Create a bootable BIOS disk image at the given path.
     pub fn create_disk_image(&self, out_path: &Path) -> anyhow::Result<()> {
         self.image_builder.create_bios_image(out_path)

src/lib.rs

@@ -13,16 +13,25 @@ mod mbr;
 #[cfg(feature = "uefi")]
 mod uefi;
 
+#[cfg(feature = "uefi")]
+pub use uefi::UefiBoot;
+
+#[cfg(feature = "bios")]
+pub use bios::BiosBoot;
+
 mod fat;
 
 use std::{
     collections::BTreeMap,
+    env::temp_dir,
+    fs,
+    io::Write,
     path::{Path, PathBuf},
 };
 
 use anyhow::Context;
 
-use tempfile::NamedTempFile;
+use tempfile::{tempfile, NamedTempFile};
 
 pub use bootloader_boot_config::BootConfig;
 
@@ -65,6 +74,31 @@ impl DiskImageBuilder {
         self.add_or_replace_file(&path, RAMDISK_FILE_NAME)
     }
 
+    /// Configures the runtime behavior of the bootloader.
+    pub fn set_boot_config(&mut self, boot_config: &BootConfig) -> &mut Self {
+        let json =
+            serde_json::to_string_pretty(boot_config).expect("failed to serialize BootConfig");
+        let bytes = json.as_bytes();
+        self.add_or_replace_file_byte_content(bytes, CONFIG_FILE_NAME)
+    }
+
+    /// Add or replace a file from a byte array
+    pub fn add_or_replace_file_byte_content(&mut self, data: &[u8], target: &str) -> &mut Self {
+        let temp_path = temp_dir();
+        let file_name = temp_path.join("bytes.tmp");
+        fs::create_dir_all(temp_path).expect("Failed to create temp directory");
+        let mut temp_file =
+            fs::File::create(file_name.clone()).expect("Failed to create temp file");
+        temp_file
+            .write_all(data)
+            .expect("Failed to write data to temp file");
+        temp_file
+            .sync_all()
+            .expect("Failed to flush temp file to disk");
+
+        self.add_or_replace_file(&file_name, target)
+    }
+
     /// Add or replace arbitrary files.
     /// NOTE: You can overwrite internal files if you choose, such as EFI/BOOT/BOOTX64.EFI
     /// This can be useful in situations where you want to generate an image, but not use the provided bootloader.

src/uefi/mod.rs

@@ -1,9 +1,8 @@
 use std::path::Path;
 
-use crate::DiskImageBuilder;
+use bootloader_boot_config::BootConfig;
 
-const BIOS_STAGE_3: &str = "boot-stage-3";
-const BIOS_STAGE_4: &str = "boot-stage-4";
+use crate::DiskImageBuilder;
 
 /// Create disk images for booting on legacy BIOS systems.
 pub struct UefiBoot {
@@ -24,6 +23,12 @@ impl UefiBoot {
         self
     }
 
+    /// Creates a configuration file (boot.json) that configures the runtime behavior of the bootloader.
+    pub fn set_boot_config(&mut self, config: &BootConfig) -> &mut Self {
+        self.image_builder.set_boot_config(config);
+        self
+    }
+
     /// Create a bootable UEFI disk image at the given path.
     pub fn create_disk_image(&self, out_path: &Path) -> anyhow::Result<()> {
         self.image_builder.create_uefi_image(out_path)

tests/runner/src/lib.rs

@@ -1,4 +1,5 @@
 use bootloader::BootConfig;
+use bootloader::DiskImageBuilder;
 use std::{io::Read, path::Path, process::Command};
 
 const QEMU_ARGS: &[&str] = &[
@@ -31,26 +32,20 @@ pub fn run_test_kernel_internal(
     config_file_path: Option<&BootConfig>,
 ) {
     let kernel_path = Path::new(kernel_binary_path);
+    let mut image_builder = DiskImageBuilder::new(kernel_path);
+    if let Some(rdp) = ramdisk_path {
+        image_builder.set_ramdisk(rdp);
+    }
+    if let Some(cfp) = config_file_path {
+        image_builder.set_boot_config(cfp);
+    }
 
     #[cfg(feature = "uefi")]
     {
-        // create a GPT disk image for UEFI booting
         let gpt_path = kernel_path.with_extension("gpt");
-        let mut uefi_builder = bootloader::UefiBoot::new(kernel_path);
-        // Set ramdisk for test, if supplied.
-        if let Some(rdp) = ramdisk_path {
-            uefi_builder.set_ramdisk(rdp);
-        }
-        if let Some(cfp) = config_file_path {
-            uefi_builder.set_boot_config(cfp);
-        }
-        uefi_builder.create_disk_image(&gpt_path).unwrap();
-
-        // create a TFTP folder with the kernel executable and UEFI bootloader for
-        // UEFI PXE booting
         let tftp_path = kernel_path.with_extension("tftp");
-        uefi_builder.create_pxe_tftp_folder(&tftp_path).unwrap();
-
+        image_builder.create_uefi_image(&gpt_path).unwrap();
+        image_builder.create_uefi_tftp_folder(&tftp_path).unwrap();
         run_test_kernel_on_uefi(&gpt_path);
         run_test_kernel_on_uefi_pxe(&tftp_path);
     }
@@ -59,32 +54,10 @@ pub fn run_test_kernel_internal(
     {
         // create an MBR disk image for legacy BIOS booting
         let mbr_path = kernel_path.with_extension("mbr");
-        let mut bios_builder = bootloader::BiosBoot::new(kernel_path);
-        // Set ramdisk for test, if supplied.
-        if let Some(rdp) = ramdisk_path {
-            bios_builder.set_ramdisk(rdp);
-        }
-        if let Some(cfp) = config_file_path {
-            bios_builder.set_boot_config(cfp);
-        }
-        bios_builder.create_disk_image(&mbr_path).unwrap();
+        image_builder.create_bios_image(mbr_path.as_path()).unwrap();
 
         run_test_kernel_on_bios(&mbr_path);
     }
-
-    #[cfg(feature = "uefi")]
-    {
-        let gpt_path = kernel_path_buf.with_extension("gpt");
-        let tftp_path = kernel_path_buf.with_extension("tftp");
-        image_builder.create_uefi_image(&gpt_path).unwrap();
-        image_builder.create_uefi_tftp_folder(&tftp_path).unwrap();
-        run_test_kernel_on_uefi(&gpt_path);
-        run_test_kernel_on_uefi_pxe(&tftp_path);
-    }
-}
-
-pub fn run_test_kernel(kernel_binary_path: &str) {
-    run_test_kernel_with_ramdisk(kernel_binary_path, None);
 }
 
 #[cfg(feature = "uefi")]