From 710dea0bae3979d084021c910af3f53388e72603 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 10 Jan 2016 13:50:35 +0100
Subject: BIOS (syslinux) and UEFI (grub2) boot: enhance the experience.

- generate the grub fonts (.pf2) ourselves instead of using the
    Slackware-provided grub font file.
- expand the help text about the boot parameters.
- show the liveslak version number in the boot menu.
- remove the 'boot any OS' menu item in Grub because it never worked for me.
- add a bit of Grub help text at the bottom of the screen.

NOTES:
- I do not like the way how I had to implement the Grub2 help menu,
  it is ugly. Perhaps the text artefacts and understrikes are caused by the
  fact that the grub console has to paint on top of the graphical boot menu?
- In any case, the grub console (the black rectangle in the middle) has its
  coordinates hard-coded in the grub2 source so it is not configurable.
- the grub fonts look better than in Beta3 but I am still not happy with them.

Research on Grub boot menu enhancements done by Didier Spaier.
---
 make_slackware_live.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'make_slackware_live.sh')

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 0200ceb..c8018dc 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -328,6 +328,7 @@ function gen_bootmenu() {
     -e "s/@MEDIALABEL@/$MEDIALABEL/g" \
     -e "s/@LIVEDE@/$(echo $LIVEDE |sed 's/BASE//')/g" \
     -e "s/@SL_VERSION@/$SL_VERSION/g" \
+    -e "s/@VERSION@/$VERSION/g" \
     > ${MENUROOTDIR}/vesamenu.cfg
 
   for LANCOD in $(cat ${LIVE_TOOLDIR}/languages |grep -Ev "(^ *#|^$)" |cut -d: -f1)
@@ -359,6 +360,7 @@ EOL
       -e "s/@MEDIALABEL@/$MEDIALABEL/g" \
       -e "s/@LIVEDE@/$(echo $LIVEDE |sed 's/BASE//')/g" \
       -e "s/@SL_VERSION@/$SL_VERSION/g" \
+      -e "s/@VERSION@/$VERSION/g" \
       > ${MENUROOTDIR}/menu_${LANCOD}.cfg
 
     # Generate custom language selection submenu for selected keyboard:
@@ -408,6 +410,7 @@ function gen_uefimenu() {
     -e "s/@MEDIALABEL@/$MEDIALABEL/g" \
     -e "s/@LIVEDE@/$(echo $LIVEDE |sed 's/BASE//')/g" \
     -e "s/@SL_VERSION@/$SL_VERSION/g" \
+    -e "s/@VERSION@/$VERSION/g" \
     > ${GRUBDIR}/grub.cfg
 
   # Set a default keyboard selection:
@@ -1314,11 +1317,11 @@ fi
 
 # Copy the UEFI boot directory structure:
 mkdir -p ${LIVE_STAGING}/EFI/BOOT
-cp -a ${LIVE_TOOLDIR}/EFI/BOOT/{grub-embedded.cfg,make-grub.sh,osdetect.cfg,theme} ${LIVE_STAGING}/EFI/BOOT/
+cp -a ${LIVE_TOOLDIR}/EFI/BOOT/{grub-embedded.cfg,make-grub.sh,*.txt,theme} ${LIVE_STAGING}/EFI/BOOT/
 
 # Create the grub fonts used in the theme:
 for FSIZE in 5 10 12; do
-  grub-mkfont -s ${FSIZE} -bav \
+  grub-mkfont -s ${FSIZE} -av \
     -o ${LIVE_STAGING}/EFI/BOOT/theme/dejavusansmono${FSIZE}.pf2 \
     /usr/share/fonts/TTF/DejaVuSansMono.ttf \
     | grep "^Font name: "
-- 
cgit v1.2.3