From 515e3b20c67bb563e3d2568da102892abcd64c12 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 15 Feb 2019 00:17:45 +0100
Subject: Fix PXE boot. Fix pxeserver. Add support for PXE-booting UEFI-based
 PC's

Note that UEFI PXE-boot is not yet working, I do not know why.
---
 make_slackware_live.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'make_slackware_live.sh')

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 7ff8d75..94c67f8 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -727,7 +727,7 @@ menuentry "${LANDSC}" {
   export sl_kbd
   export sl_xkb
   export sl_lang
-  configfile \$grubdir/grub.cfg
+  configfile \$prefix/grub.cfg
 }
 
 EOL
@@ -739,7 +739,7 @@ menuentry "${LANDSC}" {
   set sl_lang="$LANDSC"
   export sl_locale
   export sl_lang
-  configfile \$grubdir/grub.cfg
+  configfile \$prefix/grub.cfg
 }
 
 EOL
@@ -776,7 +776,7 @@ EOL
 menuentry "${TZ}" {
   set sl_tz="$TZ"
   export sl_tz
-  configfile \$grubdir/grub.cfg
+  configfile \$prefix/grub.cfg
 }
 
 EOL
@@ -1542,6 +1542,9 @@ mkdir -p ${LIVE_ROOTDIR}/var/lib/tftpboot/pxelinux.cfg
 cp -ia /usr/share/syslinux/pxelinux.0 ${LIVE_ROOTDIR}/var/lib/tftpboot/
 ln -s /mnt/livemedia/boot/generic ${LIVE_ROOTDIR}/var/lib/tftpboot/
 ln -s /mnt/livemedia/boot/initrd.img ${LIVE_ROOTDIR}/var/lib/tftpboot/
+mkdir -p ${LIVE_ROOTDIR}/var/lib/tftpboot/EFI/BOOT
+ln -s /mnt/livemedia/EFI/BOOT ${LIVE_ROOTDIR}/var/lib/tftpboot/uefi
+ln -s /mnt/livemedia/EFI/BOOT/bootx64.efi ${LIVE_ROOTDIR}/var/lib/tftpboot/EFI/BOOT/
 cat ${LIVE_TOOLDIR}/pxeserver.tpl | sed \
   -e "s/@DIRSUFFIX@/$DIRSUFFIX/g" \
   -e "s/@DISTRO@/$DISTRO/g" \
@@ -2443,8 +2446,9 @@ if [ "$SL_ARCH" = "x86_64" -o "$EFI32" = "YES" ]; then
     rm -f ${LIVE_STAGING}/EFI/BOOT/theme/unicode.pf2
   fi
 
-  # Create the grub fonts used in the theme:
-  for FSIZE in 5 10 12; do
+  # Create the grub fonts used in the theme.
+  # Command outputs string like this: "Font name: DejaVu Sans Mono Regular 5".
+  for FSIZE in 5 10 12 20 ; do
     grub-mkfont -s ${FSIZE} -av \
       -o ${LIVE_STAGING}/EFI/BOOT/theme/dejavusansmono${FSIZE}.pf2 \
       /usr/share/fonts/TTF/DejaVuSansMono.ttf \
-- 
cgit v1.2.3