Harmonize menu entries (uefi / bios) and add a variable for the templates

scripts/build/binary_grub_cfg

@@ -120,6 +120,7 @@ DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
 KERNEL_LIVE="/${INITFS}/${DEFAULT_KERNEL}"
 INITRD_LIVE="/${INITFS}/${DEFAULT_INITRD}"
 APPEND_LIVE="${LB_BOOTAPPEND_LIVE} findiso=\${iso_path}"
+FLAVOUR_LIVE="${DEFAULT_FLAVOUR}"
 
 # Ensure fresh live entries
 LIVE_ENTRIES_TMP="${_TARGET}/live.cfg.tmp"
@@ -157,13 +158,13 @@ if [ "${_AMD64_686_NUMBER}" -ge 2 ] ; then
 			"${LB_BOOTAPPEND_LIVE_FAILSAFE}"
 	fi
 else
-	Grub_live_menu_entry "Live system" \
+	Grub_live_menu_entry "Live system (${_FLAVOUR})" \
 		"/${INITFS}/${DEFAULT_KERNEL}" \
 		"/${INITFS}/${DEFAULT_INITRD}" \
 		"${APPEND_LIVE}" \
 		"l"
 	if [ "${LB_BOOTAPPEND_LIVE_FAILSAFE}" != "none" ]; then
-		Grub_live_menu_entry "Live system (fail-safe mode)" \
+		Grub_live_menu_entry "Live system (${_FLAVOUR} fail-safe mode)" \
 			"/${INITFS}/${DEFAULT_KERNEL}" \
 			"/${INITFS}/${DEFAULT_INITRD}" \
 			"${LB_BOOTAPPEND_LIVE_FAILSAFE}"
@@ -262,6 +263,7 @@ sed -i \
     -e "s|@ENABLE_MEMTEST@|${ENABLE_MEMTEST}|" \
     -e "s|@MEMTEST_BIN@|${MEMTEST_BIN}|" \
     -e "s|@MEMTEST_VERSION@|${LB_MEMTEST}|" \
+    -e "s|@FLAVOUR_LIVE@|${FLAVOUR_LIVE}|" \
     -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \
     -e "s|LINUX_ADVANCED_INSTALL|${LINUX_ADVANCED_INSTALL}|" \
     -e "s|MEMTEST|${MEMTEST}|" \

share/bootloaders/syslinux_common/live.cfg.in

@@ -1,12 +1,12 @@
 label live-@FLAVOUR@
-	menu label ^Live (@FLAVOUR@)
+	menu label ^Live system (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE@
 
 label live-@FLAVOUR@-failsafe
-	menu label Live (@FLAVOUR@ failsafe)
+	menu label Live system (@FLAVOUR@ fail-safe mode)
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE_FAILSAFE@