grub bootloader

src/builder.rs

@@ -1,3 +1,8 @@
+use crate::{
+	bail_let,
+	cli::OutputFormat,
+	config::{Manifest, Script},
+};
 use color_eyre::{eyre::eyre, Result};
 use serde_derive::{Deserialize, Serialize};
 use std::{
@@ -8,13 +13,10 @@ use std::{
 };
 use tracing::{debug, info, trace, warn};
 
-use crate::{
-	bail_let,
-	cli::OutputFormat,
-	config::{Manifest, Script},
-};
 const WORKDIR: &str = "katsu-work";
 const VOLID: &str = "KATSU-LIVEOS";
+crate::prepend_comment!(GRUB_PREPEND_COMMENT: "/etc/default/grub", "Grub default configurations", katsu::builder::Bootloader::cp_grub);
+crate::prepend_comment!(LIMINE_PREPEND_COMMENT: "/boot/limine.cfg", "Limine configurations", katsu::builder::Bootloader::cp_limine);
 
 #[derive(Default)]
 pub enum Bootloader {
@@ -41,7 +43,7 @@ impl From<&str> for Bootloader {
 impl Bootloader {
 	pub fn install(&self, image: &Path) -> Result<()> {
 		match *self {
-			Self::Grub => todo!(),
+			Self::Grub => cmd_lib::run_cmd!(grub2-install $image)?,
 			Self::Limine => cmd_lib::run_cmd!(limine bios-install $image)?,
 			Self::SystemdBoot => todo!(),
 		}
@@ -50,7 +52,7 @@ impl Bootloader {
 	pub fn get_bins(&self) -> (&'static str, &'static str) {
 		match *self {
 			Self::Grub => todo!(),
-			Self::Limine => ("boot/limine-uefi-cd.bin", "boot/limine-uefi-cd.bin"),
+			Self::Limine => ("boot/limine-uefi-cd.bin", "boot/limine-bios-cd.bin"),
 			Self::SystemdBoot => todo!(),
 		}
 	}
@@ -108,16 +110,43 @@ impl Bootloader {
 		let mut f = std::fs::File::create(root.join("boot/limine.cfg"))
 			.map_err(|e| eyre!(e).wrap_err("Cannot create limine.cfg"))?;
 
+		f.write_all(LIMINE_PREPEND_COMMENT.as_bytes())?;
 		f.write_fmt(format_args!("TIMEOUT=5\n\n:{distro}\n\tPROTOCOL=linux\n\t"))?;
 		f.write_fmt(format_args!("KERNEL_PATH=boot:///boot/{vmlinuz}\n\t"))?;
 		f.write_fmt(format_args!("MODULE_PATH=boot:///boot/{initramfs}\n\t"))?;
 		f.write_fmt(format_args!("CMDLINE=root=live:LABEL={VOLID} rd.live.image selinux=0 {cmd}"))?;
 
 		Ok(())
 	}
+
+	fn cp_grub(&self, manifest: &Manifest, chroot: &Path) -> Result<()> {
+		let imgd = chroot.parent().unwrap().join("image/");
+		let cmd = &manifest.kernel_cmdline.as_ref().map_or("", |s| s);
+
+		let cfg = std::fs::read_to_string(chroot.join("etc/default/grub"))?;
+		let mut f = std::fs::File::create(chroot.join("etc/default/grub"))?;
+		f.write_all(GRUB_PREPEND_COMMENT.as_bytes())?;
+		for l in cfg.lines() {
+			if l.starts_with("GRUB_CMDLINE_LINUX=") {
+				f.write_fmt(format_args!(
+					"GRUB_CMDLINE_LINUX=\"root=live:LABEL={VOLID} rd.live.image selinux=0 {cmd}\"\n"
+				))?;
+			} else {
+				f.write_all(l.as_bytes())?;
+				f.write_all(b"\n")?;
+			}
+		}
+		drop(f); // write and flush changes
+
+		crate::chroot_run_cmd!(chroot, grub2-mkconfig -o /boot/grub2/grub.cfg;)?;
+		cmd_lib::run_cmd!(cp -r $chroot/boot $imgd/)?; // too lazy to cp one by one
+		Ok(())
+	}
+
 	pub fn copy_liveos(&self, manifest: &Manifest, chroot: &Path) -> Result<()> {
+		info!("Copying bootloader files");
 		match *self {
-			Self::Grub => todo!(),
+			Self::Grub => self.cp_grub(manifest, chroot)?,
 			Self::Limine => self.cp_limine(manifest, chroot)?,
 			Self::SystemdBoot => todo!(),
 		}

src/config.rs

@@ -302,19 +302,14 @@ impl PartitionLayout {
 
 		let mut fstab = String::new();
 
-		const PREPEND_COMMENT: &str = r#"
-# /etc/fstab: static file system information.
-# Automatically generated by Katsu Image Builder. See 
-# katsu::config::PartitionLayout::fstab for more information.
-
-		"#;
+		crate::prepend_comment!(PREPEND_COMMENT: "/etc/fstab", "static file system information.", katsu::config::PartitionLayout::fstab);
 
-		fstab.push_str(PREPEND_COMMENT.trim());
+		fstab.push_str(PREPEND_COMMENT);
 
 		const LEGEND: &str =
 			"# <file system>\t<mount point>\t<type>\t<options>\t<dump>\t<pass>\n\n";
 
-		fstab.push_str(LEGEND.trim());
+		fstab.push_str(LEGEND);
 
 		for part in ordered.iter().map(|(_, p)| p) {
 			// get devname by finding from mount, instead of index because we won't be using it as much

src/util.rs

@@ -91,6 +91,22 @@ macro_rules! bail_let {
 	};
 }
 
+/// Automatically generates prepend comments
+#[macro_export]
+macro_rules! prepend_comment {
+	($var:ident: $path:literal, $desc:literal, $module:path) => {
+		const $var: &str = concat!(
+			"#\n# ",
+			$path,
+			": ",
+			$desc,
+			"\n# Automatically generated by Katsu Image Builder. See\n# ",
+			stringify!($module),
+			" for more information.\n\n"
+		);
+	};
+}
+
 #[tracing::instrument]
 pub fn exec(cmd: &str, args: &[&str], pipe: bool) -> color_eyre::Result<Vec<u8>> {
 	tracing::debug!("Executing command");