From 422ea1739fcdc9ee8ae1a111f76ddb0d405a0236 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:42:00 -0400
Subject: [PATCH] Fix bootloader configuration for live env

---
 buildiso.sh         | 10 +++++-----
 templates/theme.txt |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/buildiso.sh b/buildiso.sh
index d146d0d..02cc3ae 100755
--- a/buildiso.sh
+++ b/buildiso.sh
@@ -163,11 +163,11 @@ cp ../../templates/serial-getty-override.conf config/includes.chroot/etc/systemd
 echo "done."
 
 # Install GRUB config, theme, and splash
-echo -n "Copying GRUB templates... "
-mkdir -p config/includes.chroot/boot/grub
-cp ../../templates/grub.cfg config/includes.chroot/boot/grub/grub.cfg || fail "Failed to copy critical template file"
-cp ../../templates/theme.txt config/includes.chroot/boot/grub/theme.txt || fail "Failed to copy critical template file"
-cp ../../templates/splash.png config/includes.chroot/splash.png || fail "Failed to copy critical template file"
+echo -n "Copying bootloader (GRUB) templates... "
+cp -a /usr/share/live/build/bootloaders/grub-pc config/bootloaders/ || fail "Failed to copy grub-pc bootloader config from host system"
+cp ../../templates/grub.cfg config/bootloaders/grub-pc/grub.cfg || fail "Failed to copy critical template file"
+cp ../../templates/theme.txt config/bootloaders/grub-pc/live-theme/theme.txt || fail "Failed to copy critical template file"
+cp ../../templates/splash.png config/bootloaders/grub-pc/splash.png || fail "Failed to copy critical template file"
 echo "done."
 
 # Install module blacklist template
diff --git a/templates/theme.txt b/templates/theme.txt
index 654252c..1fafe89 100644
--- a/templates/theme.txt
+++ b/templates/theme.txt
@@ -1,5 +1,5 @@
 title-text: ""
-desktop-image: "/splash.png"
+desktop-image: "/boot/grub/splash.png"
 terminal-width: "800"
 terminal-height: "600"
 + boot_menu {