syslinux/dnsmasq: cleaning up PXE file generation

6 files changed, 38 insertions, 15 deletions

diff --git a/dnsmasq-httpboot.conf b/dnsmasq-httpboot.conf
index 0d0c0d6..d10e1d2 100644
--- a/dnsmasq-httpboot.conf
+++ b/dnsmasq-httpboot.conf
@@ -92,9 +92,9 @@ dhcp-option-force=210,http:///httpboot/
 dhcp-no-override
 
 
-dhcp-option-force=net:BIOS,209,/syslinux/lpxelinux.cfg
-dhcp-option-force=net:IA32,209,/EFI/BOOT/syslia32.cfg
-dhcp-option-force=net:UEFI,209,/EFI/BOOT/syslx64.cfg
+dhcp-option-force=net:BIOS,209,/syslinux/pxelinux.cfg
+dhcp-option-force=net:IA32,209,/EFI/BOOT/pxelia32.cfg
+dhcp-option-force=net:UEFI,209,/EFI/BOOT/pxelx64.cfg
 
 
 dhcp-boot=net:BIOS,syslinux/lpxelinux.0
diff --git a/dnsmasq.conf b/dnsmasq.conf
index 0da45e9..12e8332 100644
--- a/dnsmasq.conf
+++ b/dnsmasq.conf
@@ -92,9 +92,9 @@ dhcp-option-force=210,/
 dhcp-no-override
 
 
-dhcp-option-force=net:BIOS,209,/syslinux/lpxelinux.cfg
-dhcp-option-force=net:IA32,209,/EFI/BOOT/syslia32.cfg
-dhcp-option-force=net:UEFI,209,/EFI/BOOT/syslx64.cfg
+dhcp-option-force=net:BIOS,209,/syslinux/pxelinux.cfg
+dhcp-option-force=net:IA32,209,/EFI/BOOT/pxelia32.cfg
+dhcp-option-force=net:UEFI,209,/EFI/BOOT/pxelx64.cfg
 
 
 dhcp-boot=net:BIOS,syslinux/pxelinux.0
diff --git a/src/syslinux/Makefile.syslinux b/src/syslinux/Makefile.syslinux
index de4f6d3..96e9014 100644
--- a/src/syslinux/Makefile.syslinux
+++ b/src/syslinux/Makefile.syslinux
@@ -36,7 +36,9 @@
 SYSLINUX_VERSION        ?= 6.04-pre1
 MIRROR_SYSLINUX         ?= https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
 SYSLINUX_CONFIGS        = \
+                          EFI/BOOT/pxelia32.cfg \
                           EFI/BOOT/syslia32.cfg \
+                          EFI/BOOT/pxelx64.cfg \
                           EFI/BOOT/syslx64.cfg \
                           syslinux/isolinux.cfg \
                           syslinux/pxelinux.cfg \
@@ -97,9 +99,6 @@ syslinux/iperd.dep: tmp/src/syslinux-$(SYSLINUX_VERSION)/.iperd-extracted
         rsync -ra "$(PWD)/tmp/syslinux/sbin/"               syslinux/sbin
         cp $(SYSLINDIR)/f1.txt                              syslinux/
         cp $(SYSLINDIR)/f2.txt                              syslinux/
-        cp $(SYSLINDIR)/lpxelinux.cfg                       syslinux/
-        cp $(SYSLINDIR)/efi32/pxelinux.cfg                  syslinux/efi32/
-        cp $(SYSLINDIR)/efi64/pxelinux.cfg                  syslinux/efi64/
         cp /usr/share/hwdata/pci.ids                        syslinux/
         cp /lib/modules/$$(uname -r)/modules.alias          syslinux/modules.als
         @touch "$(@)"
@@ -129,6 +128,21 @@ EFI/BOOT/ldlinux.e64 ldlinux.e64: syslinux/iperd.dep
         @touch $(@)
 
 
+EFI/BOOT/pxelia32.cfg: Makefile.config var/config/pxelx64.inc $(PREREQ_BIN) $(SYSLINDIR)/common.cfg
+        @mkdir -p $$(dirname $(@))
+        @rm -f "$(@)"
+        @mkdir -p "$$(dirname "$(@)")"
+        @echo 'do_subst $$(SYSLINDIR)/common.cfg var/config/pxelia32.inc > $(@)'
+        @$(do_subst) \
+           $(SYSLINDIR)/common.cfg \
+           var/config/pxelia32.inc \
+           | sed \
+              -e 's/[@]SYSLINUX_FLAVOR[@]/pxe\/UEFI/g' \
+              -e 's,[@]SYSLINUX_PATH[@],/syslinux/efi64/,g' \
+           > "$(@)"
+        @touch "$(@)"
+
+
 EFI/BOOT/syslia32.cfg: Makefile.config var/config/syslx64.inc $(PREREQ_BIN) $(SYSLINDIR)/common.cfg
         @mkdir -p $$(dirname $(@))
         @rm -f "$(@)"
@@ -144,6 +158,21 @@ EFI/BOOT/syslia32.cfg: Makefile.config var/config/syslx64.inc $(PREREQ_BIN) $(SY
         @touch "$(@)"
 
 
+EFI/BOOT/pxelx64.cfg: Makefile.config var/config/pxelx64.inc $(PREREQ_BIN) $(SYSLINDIR)/common.cfg
+        @mkdir -p $$(dirname $(@))
+        @rm -f "$(@)"
+        @mkdir -p "$$(dirname "$(@)")"
+        @echo 'do_subst $$(SYSLINDIR)/common.cfg var/config/pxelx64.inc > $(@)'
+        @$(do_subst) \
+           $(SYSLINDIR)/common.cfg \
+           var/config/pxelx64.inc \
+           | sed \
+              -e 's/[@]SYSLINUX_FLAVOR[@]/pxe\/UEFI/g' \
+              -e 's,[@]SYSLINUX_PATH[@],/syslinux/efi64/,g' \
+           > "$(@)"
+        @touch "$(@)"
+
+
 EFI/BOOT/syslx64.cfg: Makefile.config var/config/syslx64.inc $(PREREQ_BIN) $(SYSLINDIR)/common.cfg
         @mkdir -p $$(dirname $(@))
         @rm -f "$(@)"
diff --git a/src/syslinux/efi32/pxelinux.cfg b/src/syslinux/efi32/pxelinux.cfg
deleted file mode 100644
index 268c5c8..0000000
--- a/src/syslinux/efi32/pxelinux.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH /syslinux/efi32
-INCLUDE /syslinux/pxelinux.cfg
diff --git a/src/syslinux/efi64/pxelinux.cfg b/src/syslinux/efi64/pxelinux.cfg
deleted file mode 100644
index a0ddcf6..0000000
--- a/src/syslinux/efi64/pxelinux.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH /syslinux/efi64
-INCLUDE /syslinux/pxelinux.cfg
diff --git a/src/syslinux/lpxelinux.cfg b/src/syslinux/lpxelinux.cfg
deleted file mode 100644
index 5605978..0000000
--- a/src/syslinux/lpxelinux.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH /syslinux
-INCLUDE /syslinux/pxelinux.cfg