Merge pull request #1205 from ResearchIT/dnsmasq-ipxe-fix

Reorder dnsmasq config template to put iPXE last

CHANGELOG.md

@@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 
 - Fix nightly release build failure issue. #1195
+- Reorder dnsmasq config to put iPXE last. #1146
 
 ## v4.5.1, 2024-04-30
 

CONTRIBUTORS.md

@@ -33,3 +33,4 @@
 * Dietmar Rieder <dietmar.rieder@i-med.ac.at>
 * Andreas Henkel <henkel@uni-mainz.de>
 * Timothy Middelkoop <tmiddelkoop@internet2.edu>
+* Shane Nehring <snehring@iastate.edu>

overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww

@@ -15,8 +15,6 @@ dhcp-vendorclass=set:efi-http,HTTPClient:Arch:00016
 dhcp-option-force=tag:efi-http,60,HTTPClient
 # for http boot always use shim/grub
 dhcp-boot=tag:efi-http,"http://{{$.Ipaddr}}:{{$.Warewulf.Port}}/efiboot/shim.efi"
-# iPXE binary will get the following configuration file
-dhcp-boot=tag:iPXE,"http://{{$.Ipaddr}}:{{$.Warewulf.Port}}/ipxe/${mac:hexhyp}"
 {{- if $.Warewulf.GrubBoot }}
 dhcp-boot=tag:x86PC,"warewulf/shim.efi"
 {{- else }}
@@ -27,6 +25,8 @@ dhcp-boot=tag:x86PC,"/warewulf/{{ index $.Tftp.IpxeBinaries "00:07" }}"
 dhcp-boot=tag:aarch64,"/warewulf/{{ index $.Tftp.IpxeBinaries "00:0B" }}"
 {{- end }}
 {{- end }}
+# iPXE binary will get the following configuration file
+dhcp-boot=tag:iPXE,"http://{{$.Ipaddr}}:{{$.Warewulf.Port}}/ipxe/${mac:hexhyp}"
 dhcp-no-override
 {{- if $.Tftp.Enabled }}
 # also act as tftp server