Update builder image version to f40, don't make grub2-mkconfig fatal,…

… add new partition type for grub mbr

.github/workflows/build-test.yml

@@ -93,7 +93,7 @@ jobs:
   image-x86_64:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
       # Pass /dev from host to container
       # Very hacky, but it works
       # Microsoft/Github, if you're reading this,

src/builder.rs

@@ -376,7 +376,18 @@ impl RootBuilder for DnfRootBuilder {
 			info!("Generating GRUB configuration");
 			crate::chroot_run_cmd!(&chroot,
 				echo "GRUB_DISABLE_OS_PROBER=true" > /etc/default/grub;
+			)?;
+
+			// While grub2-mkconfig may not return 0 it should still work
+			let res = crate::chroot_run_cmd!(&chroot,
 				grub2-mkconfig -o /boot/grub2/grub.cfg;
+			);
+
+			if let Err(e) = res {
+				warn!(?e, "grub2-mkconfig not returning 0, continuing anyway");
+			}
+
+			crate::chroot_run_cmd!(&chroot,
 				rm -f /etc/default/grub;
 			)?;
 		}

src/config.rs

@@ -670,6 +670,8 @@ pub enum PartitionType {
 	Swap,
 	/// A generic partition that carries a Linux filesystem
 	LinuxGeneric,
+	/// MBR header partition for grub-install
+	BiosGrub,
 	/// An arbitrary GPT partition type GUID/UUIDv4
 	#[serde(untagged)]
 	Guid(uuid::Uuid),
@@ -693,6 +695,7 @@ impl PartitionType {
 			PartitionType::Xbootldr => "bc13c2ff-59e6-4262-a352-b275fd6f7172",
 			PartitionType::Swap => "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f",
 			PartitionType::LinuxGeneric => "0fc63daf-8483-4772-8e79-3d69d8477de4",
+			PartitionType::BiosGrub => "21686148-6449-6E6F-744E-656564454649",
 			PartitionType::Guid(guid) => return guid.to_string(),
 		}
 		.to_string()

tests/ng/katsu-bios.yaml

@@ -23,10 +23,10 @@ disk:
   size: 8GiB
   partitions:
     - label: mbr_grub
-      type: 21686148-6449-6E6F-744E-656564454649
+      type: bios-grub
       size: 1MiB
       filesystem: none # no filesystem
-      mountpoint: ""
+      mountpoint: "-"
 
     - label: boot
       type: xbootldr