From 491815e7aee749628b41b71e259d86fa8b206806 Mon Sep 17 00:00:00 2001
From: Sophie Brun <sophie@offensive-security.com>
Date: Fri, 21 Jan 2022 14:54:08 +0100
Subject: [PATCH] Harmonize menus entries

* Override *.cfg instead of using hooks
* Harmonize the menu entries labels (same text, add architectures...)
---
 .../common/bootloaders/grub-pc/grub.cfg       | 24 +++++++-------
 .../bootloaders/syslinux_common/live.cfg.in   | 31 +++++++++++++++++++
 .../bootloaders/syslinux_common/menu.cfg      | 18 +++++++++++
 .../common/hooks/live/forensic-menu.binary    | 15 ---------
 .../common/hooks/live/persistence-menu.binary | 23 --------------
 5 files changed, 61 insertions(+), 50 deletions(-)
 create mode 100644 kali-config/common/bootloaders/syslinux_common/live.cfg.in
 create mode 100644 kali-config/common/bootloaders/syslinux_common/menu.cfg
 delete mode 100755 kali-config/common/hooks/live/forensic-menu.binary
 delete mode 100755 kali-config/common/hooks/live/persistence-menu.binary

diff --git a/kali-config/common/bootloaders/grub-pc/grub.cfg b/kali-config/common/bootloaders/grub-pc/grub.cfg
index ebe5c20..909a8e9 100644
--- a/kali-config/common/bootloaders/grub-pc/grub.cfg
+++ b/kali-config/common/bootloaders/grub-pc/grub.cfg
@@ -4,17 +4,17 @@ source /boot/grub/config.cfg
 # Live boot
 LINUX_LIVE
 
-menuentry "Live (forensic mode)" {
-	linux KERNEL_LIVE APPEND_LIVE noswap noautomount
-	initrd INITRD_LIVE
+menuentry "Live system (@FLAVOUR_LIVE@ forensic mode)" {
+	linux @KERNEL_LIVE@ @APPEND_LIVE@ noswap noautomount
+	initrd @INITRD_LIVE@
 }
-menuentry "Live USB Persistence              (check kali.org/prst)" {
-	linux KERNEL_LIVE APPEND_LIVE persistence
-	initrd INITRD_LIVE
+menuentry "Live system with USB persistence  (check kali.org/prst)" {
+	linux @KERNEL_LIVE@ @APPEND_LIVE@ persistence
+	initrd @INITRD_LIVE@
 }
-menuentry "Live USB Encrypted Persistence    (check kali.org/prst)" {
-	linux KERNEL_LIVE APPEND_LIVE persistent=cryptsetup persistence-encryption=luks persistence
-	initrd INITRD_LIVE
+menuentry "Live system with USB Encrypted persistence" {
+	linux @KERNEL_LIVE@ @APPEND_LIVE@ persistent=cryptsetup persistence-encryption=luks persistence
+	initrd @INITRD_LIVE@
 }
 
 # Installer (if any)
@@ -22,12 +22,12 @@ LINUX_INSTALL
 
 if [ ! -e /boot/grub/install.cfg ]; then
 menuentry "Start installer with speech synthesis" {
-	linux KERNEL_GI speakup.synth=soft APPEND_GI
-	initrd INITRD_GI
+	linux @KERNEL_GI@ speakup.synth=soft @APPEND_GI@
+	initrd @INITRD_GI@
 }
 fi
 
-submenu 'Advanced options' {
+submenu 'Advanced install options...' {
 
 source /boot/grub/theme.cfg
 
diff --git a/kali-config/common/bootloaders/syslinux_common/live.cfg.in b/kali-config/common/bootloaders/syslinux_common/live.cfg.in
new file mode 100644
index 0000000..ebe20e5
--- /dev/null
+++ b/kali-config/common/bootloaders/syslinux_common/live.cfg.in
@@ -0,0 +1,31 @@
+label live-@FLAVOUR@
+        menu label ^Live system (@FLAVOUR@)
+        menu default
+        linux @LINUX@
+        initrd @INITRD@
+        append @APPEND_LIVE@
+
+label live-@FLAVOUR@-failsafe
+        menu label Live system (@FLAVOUR@ fail-safe mode)
+        linux @LINUX@
+        initrd @INITRD@
+        append @APPEND_LIVE_FAILSAFE@
+
+label live-forensic
+        menu label Live system (@FLAVOUR@ ^forensic mode)
+        linux @LINUX@
+        initrd @INITRD@
+        append boot=live username=kali hostname=kali systemd.swap=no noautomount
+
+label live-persistence
+        menu label Live system with ^USB persistence  (check kali.org/prst)
+        linux @LINUX@
+        initrd @INITRD@
+        append boot=live username=kali hostname=kali persistence
+
+label live-encrypted-persistence
+	menu label Live system with USB ^Encrypted persistence
+        linux @LINUX@
+        initrd @INITRD@
+        append boot=live persistent=cryptsetup persistence-encryption=luks username=kali hostname=kali persistence
+
diff --git a/kali-config/common/bootloaders/syslinux_common/menu.cfg b/kali-config/common/bootloaders/syslinux_common/menu.cfg
new file mode 100644
index 0000000..12a2ba2
--- /dev/null
+++ b/kali-config/common/bootloaders/syslinux_common/menu.cfg
@@ -0,0 +1,18 @@
+menu hshift 0
+menu width 82
+
+menu title Kali Linux live menu (BIOS mode)
+include stdmenu.cfg
+include live.cfg
+@OPTIONAL_INSTALLER_INCLUDE@
+menu begin utilities
+        menu label ^Utilities
+        menu title Utilities
+        include stdmenu.cfg
+        label mainmenu
+                menu label ^Back..
+                menu exit
+        include utilities.cfg
+menu end
+
+menu clear
diff --git a/kali-config/common/hooks/live/forensic-menu.binary b/kali-config/common/hooks/live/forensic-menu.binary
deleted file mode 100755
index 27d967b..0000000
--- a/kali-config/common/hooks/live/forensic-menu.binary
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Live Image (BIOS boot)
-
-if [ ! -d isolinux ]; then
-    cd binary
-fi
-
-cat >>isolinux/live.cfg <<END
-
-label live-forensic
-	menu label Live (^forensic mode)
-	linux /live/vmlinuz
-	initrd /live/initrd.img
-	append boot=live username=kali hostname=kali systemd.swap=no noautomount
-END
diff --git a/kali-config/common/hooks/live/persistence-menu.binary b/kali-config/common/hooks/live/persistence-menu.binary
deleted file mode 100755
index 9736da8..0000000
--- a/kali-config/common/hooks/live/persistence-menu.binary
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Live Image (BIOS boot)
-
-if [ ! -d isolinux ]; then
-    cd binary
-fi
-
-cat >>isolinux/live.cfg <<END
-
-label live-persistence
-    menu label Live ^USB Persistence              (check kali.org/prst)
-    linux /live/vmlinuz
-    initrd /live/initrd.img
-    append boot=live username=kali hostname=kali persistence
-
-label live-encrypted-persistence
-    menu label Live USB ^Encrypted Persistence    (check kali.org/prst)
-    linux /live/vmlinuz
-    initrd /live/initrd.img
-    append boot=live persistent=cryptsetup persistence-encryption=luks username=kali hostname=kali persistence
-END
-
-sed -i isolinux/menu.cfg -e 's|menu title Boot menu|menu title Kali Linux live menu (BIOS mode)|'