From 80dad2d0b53dacdf6e4d32ecf4aaef9a6495bddb Mon Sep 17 00:00:00 2001
From: Idan Horowitz <idan.horowitz@gmail.com>
Date: Sat, 18 May 2024 19:21:40 +0300
Subject: [PATCH] Meta: Unbreak default grub configs after Prekernel/Kernel
 merge

These still assume the main boot image is called Prekernel, which is no
longer the case.
---
 Meta/grub-ebr.cfg | 12 ++++--------
 Meta/grub-gpt.cfg | 12 ++++--------
 Meta/grub-mbr.cfg | 12 ++++--------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/Meta/grub-ebr.cfg b/Meta/grub-ebr.cfg
index 21d542d8bd8..e1066302f1f 100644
--- a/Meta/grub-ebr.cfg
+++ b/Meta/grub-ebr.cfg
@@ -2,25 +2,21 @@ timeout=1
 
 menuentry 'SerenityOS (normal)' {
   root=hd0,5
-  multiboot /boot/Prekernel root="lun0:0:0;part3"
-  module /boot/Kernel
+  multiboot /boot/Kernel root="lun0:0:0;part3"
 }
 
 menuentry 'SerenityOS (text mode)' {
   root=hd0,5
-  multiboot /boot/Prekernel graphics_subsystem_mode=off root="lun0:0:0;part3"
-  module /boot/Kernel
+  multiboot /boot/Kernel graphics_subsystem_mode=off root="lun0:0:0;part3"
 }
 
 menuentry 'SerenityOS (No ACPI)' {
   root=hd0,5
-  multiboot /boot/Prekernel root="lun0:0:0;part3" acpi=off
-  module /boot/Kernel
+  multiboot /boot/Kernel root="lun0:0:0;part3" acpi=off
 }
 
 menuentry 'SerenityOS (with serial debug)' {
   root=hd0,5
-  multiboot /boot/Prekernel serial_debug root="lun0:0:0;part3"
-  module /boot/Kernel
+  multiboot /boot/Kernel serial_debug root="lun0:0:0;part3"
 }
 
diff --git a/Meta/grub-gpt.cfg b/Meta/grub-gpt.cfg
index 404e44152d8..9b83bc8175b 100644
--- a/Meta/grub-gpt.cfg
+++ b/Meta/grub-gpt.cfg
@@ -2,24 +2,20 @@ timeout=1
 
 menuentry 'SerenityOS (normal)' {
   root=hd0,2
-  multiboot /boot/Prekernel root="lun0:0:0;part1"
-  module /boot/Kernel
+  multiboot /boot/Kernel root="lun0:0:0;part1"
 }
 
 menuentry 'SerenityOS (text mode)' {
   root=hd0,2
-  multiboot /boot/Prekernel graphics_subsystem_mode=off root="lun0:0:0;part1"
-  module /boot/Kernel
+  multiboot /boot/Kernel graphics_subsystem_mode=off root="lun0:0:0;part1"
 }
 
 menuentry 'SerenityOS (No ACPI)' {
   root=hd0,2
-  multiboot /boot/Prekernel root="lun0:0:0;part1" acpi=off
-  module /boot/Kernel
+  multiboot /boot/Kernel root="lun0:0:0;part1" acpi=off
 }
 
 menuentry 'SerenityOS (with serial debug)' {
   root=hd0,2
-  multiboot /boot/Prekernel serial_debug root="lun0:0:0;part1"
-  module /boot/Kernel
+  multiboot /boot/Kernel serial_debug root="lun0:0:0;part1"
 }
diff --git a/Meta/grub-mbr.cfg b/Meta/grub-mbr.cfg
index 1ae1daea683..b8af9642c31 100644
--- a/Meta/grub-mbr.cfg
+++ b/Meta/grub-mbr.cfg
@@ -2,24 +2,20 @@ timeout=1
 
 menuentry 'SerenityOS (normal)' {
   root=hd0,1
-  multiboot /boot/Prekernel root="lun0:0:0;part0"
-  module /boot/Kernel
+  multiboot /boot/Kernel root="lun0:0:0;part0"
 }
 
 menuentry 'SerenityOS (text mode)' {
   root=hd0,1
-  multiboot /boot/Prekernel graphics_subsystem_mode=off root="lun0:0:0;part0"
-  module /boot/Kernel
+  multiboot /boot/Kernel graphics_subsystem_mode=off root="lun0:0:0;part0"
 }
 
 menuentry 'SerenityOS (No ACPI)' {
   root=hd0,1
-  multiboot /boot/Prekernel root="lun0:0:0;part0" acpi=off
-  module /boot/Kernel
+  multiboot /boot/Kernel root="lun0:0:0;part0" acpi=off
 }
 
 menuentry 'SerenityOS (with serial debug)' {
   root=hd0,1
-  multiboot /boot/Prekernel serial_debug root="lun0:0:0;part0"
-  module /boot/Kernel
+  multiboot /boot/Kernel serial_debug root="lun0:0:0;part0"
 }