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.
---
 EFI/BOOT/grub-embedded.cfg  | 1 -
 EFI/BOOT/grub.cfg           | 2 +-
 EFI/BOOT/make-grub.sh       | 4 ++--
 EFI/BOOT/theme/liveslak.txt | 8 ++------
 4 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'EFI')

diff --git a/EFI/BOOT/grub-embedded.cfg b/EFI/BOOT/grub-embedded.cfg
index 998ec63..917672f 100644
--- a/EFI/BOOT/grub-embedded.cfg
+++ b/EFI/BOOT/grub-embedded.cfg
@@ -1,2 +1 @@
 search --file --no-floppy --set=root /EFI/BOOT/SLACKWARELIVE
-set prefix=($root)/EFI/BOOT/
diff --git a/EFI/BOOT/grub.cfg b/EFI/BOOT/grub.cfg
index 658721b..63e7c80 100644
--- a/EFI/BOOT/grub.cfg
+++ b/EFI/BOOT/grub.cfg
@@ -1 +1 @@
-source ($root)/EFI/BOOT/menu/grub.cfg
+source $prefix/menu/grub.cfg
diff --git a/EFI/BOOT/make-grub.sh b/EFI/BOOT/make-grub.sh
index 441cd39..6575ea7 100644
--- a/EFI/BOOT/make-grub.sh
+++ b/EFI/BOOT/make-grub.sh
@@ -44,8 +44,8 @@ echo "Building ${EFIDIR}/boot${EFISUFF}.efi and /boot/syslinux/efiboot.img."
 # works with mutiple grub releases (grub-2.02 added the 'disk' module):
 GMODDIR="$(dirname $(LANG=C grub-mkimage -O ${EFIFORM}-efi -p ${EFIDIR} alienbob 2>&1 | cut -d\` -f2 |cut -d\' -f1) )"
 GMODLIST=""
-for GMOD in part_gpt part_msdos fat ext2 iso9660 ntfs chain linux boot configfile normal regexp extcmd minicmd reboot halt search search_fs_file search_fs_uuid search_label gfxterm gfxmenu gfxterm_background fxterm_menu efi_gop efi_uga all_video loadbios gzio echo true probe loadenv bitmap_scale font cat help ls png jpeg tga test at_keyboard usb_keyboard disk memdisk nativedisk file loopback tar ; do
-  [ -f ${GMODDIR}/${GMOD}.mod ] && GMODLIST="${GMODLIST} ${GMOD}"
+for GMOD in part_gpt part_msdos fat ext2 iso9660 ntfs chain linux boot configfile normal regexp extcmd minicmd reboot halt search search_fs_file search_fs_uuid search_label gfxterm gfxmenu gfxterm_background efi_gop efi_uga all_video loadbios gzio echo true probe loadenv bitmap_scale font cat help ls png jpeg tga test at_keyboard usb_keyboard disk memdisk nativedisk file loopback tar tftp net efinet efifwsetup ; do
+  [ -f ${GMODDIR}/${GMOD}.mod ] && GMODLIST="${GMODLIST} ${GMOD}" || echo ">> ${GMOD} not found"
 done
 
 # Build bootx64.efi/bootia32.efi, which will be installed here in ${EFIDIR}.
diff --git a/EFI/BOOT/theme/liveslak.txt b/EFI/BOOT/theme/liveslak.txt
index 4334f20..48b1cc4 100644
--- a/EFI/BOOT/theme/liveslak.txt
+++ b/EFI/BOOT/theme/liveslak.txt
@@ -1,15 +1,13 @@
 # -- Slackware Live Edition --
 # In grub.cfg add:
-# set theme=($root)/EFI/BOOT/theme/liveslak.txt
+# set theme=$prefix/theme/liveslak.txt
 # export theme
 #
 # Global Properties:
-#title-text: "Slackware Live Edition"
 title-text: ""
-#title-font: "Unknown Regular 16"
 title-font: "DejaVu Sans Mono Regular 12"
 title-color: "#5569B9"
-desktop-image: "/EFI/BOOT/theme/swlogog.png"
+desktop-image: "swlogog.png"
 desktop-color: "#000000"
 message-font: "DejaVu Sans Mono Regular 12"
 terminal-font: "DejaVu Sans Mono Regular 10"
@@ -20,7 +18,6 @@ terminal-font: "DejaVu Sans Mono Regular 10"
   top = 35%
   width = 75%
   height = 45%
-  #item_font = "Unknown Regular 16"
   item_font = "DejaVu Sans Mono Regular 12"
   item_color = "lightgrey"
   selected_item_color = "red"
@@ -37,7 +34,6 @@ terminal-font: "DejaVu Sans Mono Regular 10"
   width = 90%
   top = 85%
   height = 5
-  #font = "Unknown Regular 16"
   font = "DejaVu Sans Mono Regular 5"
   text_color = "red"
   fg_color = "#5569B9"
-- 
cgit v1.2.3