Harmonize menus entries

* Override *.cfg instead of using hooks
* Harmonize the menu entries labels (same text, add architectures...)

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)" {
+menuentry "Live system (@FLAVOUR_LIVE@ forensic mode)" {
-	linux KERNEL_LIVE APPEND_LIVE noswap noautomount
+	linux @KERNEL_LIVE@ @APPEND_LIVE@ noswap noautomount
-	initrd INITRD_LIVE
+	initrd @INITRD_LIVE@
 }
-menuentry "Live USB Persistence              (check kali.org/prst)" {
+menuentry "Live system with USB persistence  (check kali.org/prst)" {
-	linux KERNEL_LIVE APPEND_LIVE persistence
+	linux @KERNEL_LIVE@ @APPEND_LIVE@ persistence
-	initrd INITRD_LIVE
+	initrd @INITRD_LIVE@
 }
-menuentry "Live USB Encrypted Persistence    (check kali.org/prst)" {
+menuentry "Live system with USB Encrypted persistence" {
-	linux KERNEL_LIVE APPEND_LIVE persistent=cryptsetup persistence-encryption=luks persistence
+	linux @KERNEL_LIVE@ @APPEND_LIVE@ persistent=cryptsetup persistence-encryption=luks persistence
-	initrd INITRD_LIVE
+	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
+	linux @KERNEL_GI@ speakup.synth=soft @APPEND_GI@
-	initrd INITRD_GI
+	initrd @INITRD_GI@
 }
 fi
 
-submenu 'Advanced options' {
+submenu 'Advanced install options...' {
 
 source /boot/grub/theme.cfg
 

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
+

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

kali-config/common/hooks/live/forensic-menu.binary

@@ -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

kali-config/common/hooks/live/persistence-menu.binary

@@ -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)|'