From e58c58a76bcdcafa3de2019b01ba64b737f071c2 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:41:53 -0400
Subject: [PATCH] Handle kernel properly

---
 buildiso.sh | 5 +++--
 grub.cfg    | 4 ++--
 menu.cfg    | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/buildiso.sh b/buildiso.sh
index 4715db0..dfa9eec 100755
--- a/buildiso.sh
+++ b/buildiso.sh
@@ -33,8 +33,9 @@ prepare_iso() {
     rmdir ${iso_tempdir} &>/dev/null
     sudo cp -a grub.cfg ${tempdir}/installer/boot/grub/grub.cfg &>/dev/null || fail "Error copying grub.cfg file."
     sudo cp -a menu.cfg ${tempdir}/installer/isolinux/menu.cfg &>/dev/null || fail "Error copying menu.cfg file."
-    sudo cp -a debootstrap/boot/vmlinuz* ${tempdir}/installer/live/ &>/dev/null || fail "Error copying kernel."
-    sudo cp -a debootstrap/boot/initrd.img** ${tempdir}/installer/live/ || fail "Error copying initrd."
+    kernver=$( basename debootstrap/boot/vmlinuz* | head -1 | sed 's/vmlinuz-//' )
+    sudo cp -a debootstrap/boot/vmlinuz-${kernver} ${tempdir}/installer/live/vmlinuz &>/dev/null || fail "Error copying kernel."
+    sudo cp -a debootstrap/boot/initrd.img-${kernver} ${tempdir}/installer/live/initrd.img || fail "Error copying initrd."
     echo "done."
 }
 
diff --git a/grub.cfg b/grub.cfg
index 9307aa1..0c4331a 100644
--- a/grub.cfg
+++ b/grub.cfg
@@ -28,8 +28,8 @@ set loopback="findiso=${iso_path}"
 fi
 
 menuentry "PVC Live Installer" {
-  linux  /live/vmlinuz-4.19.0-5-amd64 boot=live components splash quiet "${loopback}"
-  initrd /live/initrd.img-4.19.0-5-amd64
+  linux  /live/vmlinuz boot=live components splash quiet "${loopback}"
+  initrd /live/initrd.img
 }
 menuentry "Traditional Debian Installer (graphical)" {
   linux  /d-i/gtk/vmlinuz append video=vesa:ywrap,mtrr vga=788 "${loopback}"
diff --git a/menu.cfg b/menu.cfg
index 2a81bc1..d9f9beb 100644
--- a/menu.cfg
+++ b/menu.cfg
@@ -3,8 +3,8 @@ MENU title PVC Live Installer
 DEFAULT PVC Live Installer
 LABEL PVC Live Installer
   SAY "Booting PVC Live Installer..."
-  linux /live/vmlinuz-4.19.0-5-amd64
-  APPEND initrd=/live/initrd.img-4.19.0-5-amd64 boot=live components splash quiet
+  linux /live/vmlinuz
+  APPEND initrd=/live/initrd.img boot=live components splash quiet
 
 LABEL Traditional Debian Installer (graphical)
   SAY "Booting Traditional Debian Installer (graphical)..."