From 6692a3e2c01d71b5f8b870b629ee03e0ec681f7d Mon Sep 17 00:00:00 2001
From: Drew Galbraith <drew@tiramisu.one>
Date: Sun, 18 May 2025 19:11:52 -0700
Subject: [PATCH] Fix build image.

---
 rust-toolchain.toml        |  3 +++
 rust/rust-toolchain.toml   |  2 --
 rust/x86_64-acadia-os.json |  4 ++--
 scripts/build_image.sh     | 10 +++++-----
 4 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 rust-toolchain.toml
 delete mode 100644 rust/rust-toolchain.toml

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..66768f4
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2025-10-02"
+components = ["rustfmt", "rust-analyzer"]
diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml
deleted file mode 100644
index 5d56faf..0000000
--- a/rust/rust-toolchain.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly"
diff --git a/rust/x86_64-acadia-os.json b/rust/x86_64-acadia-os.json
index 6e6dec1..1060335 100644
--- a/rust/x86_64-acadia-os.json
+++ b/rust/x86_64-acadia-os.json
@@ -3,8 +3,8 @@
     "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
     "arch": "x86_64",
     "target-endian": "little",
-    "target-pointer-width": "64",
-    "target-c-int-width": "32",
+    "target-pointer-width": 64,
+    "target-c-int-width": 32,
     "os": "none",
     "executables": true,
     "linker-flavor": "ld.lld",
diff --git a/scripts/build_image.sh b/scripts/build_image.sh
index 2fd5867..9b39927 100644
--- a/scripts/build_image.sh
+++ b/scripts/build_image.sh
@@ -31,15 +31,15 @@ cleanup() {
 }
 trap cleanup EXIT
 
-parted -s $dev mklabel gpt mkpart EFI fat32 1MiB 10MiB mkpart ext2 10MiB 100% set 1 esp on
-mkfs.fat -F 12 "${dev}p1"
-mke2fs "${dev}p2"
+parted -s $dev mklabel gpt mkpart BIOS ext2 1MiB 2MiB mkpart EFI fat32 2MiB 11MiB mkpart ext2 11MiB 100% set 1 bios_grub on set 2 esp on
+mkfs.fat -F 12 "${dev}p2"
+mke2fs "${dev}p3"
 
 limine bios-install "${dev}"
 
 
 mkdir -p $EFI_DIR
-mount "${dev}p1" $EFI_DIR
+mount "${dev}p2" $EFI_DIR
 
 mkdir -p $EFI_DIR/EFI/BOOT
 cp /usr/share/limine/BOOTX64.EFI $EFI_DIR/EFI/BOOT
@@ -52,7 +52,7 @@ cp $REPO_ROOT/sysroot/bin/denali $EFI_DIR/sys/denali
 cp $REPO_ROOT/sysroot/bin/victoriafalls $EFI_DIR/sys/victoriafalls
 
 mkdir -p $SYSROOT
-mount "${dev}p2" $SYSROOT
+mount "${dev}p3" $SYSROOT
 rsync -a "$REPO_ROOT/sysroot" $BUILD_DIR
 ls $SYSROOT