From bd8b1884e1304cd7048a412eac7948d03f6c5370 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 14 Feb 2021 22:07:22 +0200
Subject: drop cauldron references

---
 images/NEWS          | 2 ++
 images/grub2.config  | 4 ++--
 images/grub2.theme   | 2 +-
 images/make_boot_img | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/images/NEWS b/images/NEWS
index d4c443273..a50780a1b 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- drop cauldron references
+
 Version 2.81 -  4 January 2021 by Thomas Backlund
 
 - recognize rtw89_pci driver
diff --git a/images/grub2.config b/images/grub2.config
index 9cde03e59..c7c176a0f 100644
--- a/images/grub2.config
+++ b/images/grub2.config
@@ -22,12 +22,12 @@ set timeout=10
 
 search --no-floppy --set=root -l 'Mageia-8-x86_64-netinstall'
 
-menuentry 'Start Mageia 8 (Cauldron) Install' {
+menuentry 'Start Mageia 8 Install' {
         linux /isolinux/x86_64/vmlinuz audit=0 quiet noiswmd
         initrd /isolinux/x86_64/all.rdz
 }
 
-menuentry 'Start Mageia 8 (Cauldron) Rescue' {
+menuentry 'Start Mageia 8 Rescue' {
         linux /isolinux/x86_64/vmlinuz audit=0 noiswmd rescue
         initrd /isolinux/x86_64/all.rdz
 }
diff --git a/images/grub2.theme b/images/grub2.theme
index f8580036a..5bbd2a6fd 100644
--- a/images/grub2.theme
+++ b/images/grub2.theme
@@ -1,6 +1,6 @@
 # GRUB gfxmenu theme "maggy".
 
-title-text: "Mageia 8 (Cauldron) UEFI"
+title-text: "Mageia 8 UEFI"
 title-font: "MageiaLogo Bold 28"
 title-color: "white"
 
diff --git a/images/make_boot_img b/images/make_boot_img
index 34c521865..3a1bec485 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -396,8 +396,8 @@ fallback 1
 title Mageia Install
 
 root (hd0,0)
-kernel /cauldron/isolinux/alt0/vmlinuz $default_append $default_acpi $default_vga $default_iswmd automatic=method:disk
-initrd /cauldron/isolinux/alt0/all.rdz
+kernel /8/isolinux/alt0/vmlinuz $default_append $default_acpi $default_vga $default_iswmd automatic=method:disk
+initrd /8/isolinux/alt0/all.rdz
 
 title Help
 
@@ -411,7 +411,7 @@ pause Then change "root (hd0,0)". FYI:
 pause - (hd0,0) is the first partition on first bios hard drive (usually hda1)
 pause - (hd0,4) is the first extended partition (usually hda5)
 pause - (hd1,0) is the first partition on second bios hard drive
-pause Replace /cauldron to suit the directory containing Mageia
+pause Replace /8 to suit the directory containing Mageia
 pause .
 pause HELP END
 EOF
-- 
cgit v1.2.1