From 6e6344830d2d3bb472a539408b0dfac530fe4029 Mon Sep 17 00:00:00 2001 From: snehring Date: Wed, 24 Apr 2024 10:20:14 -0500 Subject: [PATCH 1/2] Reorder dnsmasq config template to put iPXE last. Signed-off-by: snehring --- CONTRIBUTORS.md | 1 + overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 3b2af24c..6c61e512 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -33,3 +33,4 @@ * Dietmar Rieder * Andreas Henkel * Timothy Middelkoop +* Shane Nehring diff --git a/overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww b/overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww index 6271b7eb..ce7ae6e3 100644 --- a/overlays/host/rootfs/etc/dnsmasq.d/ww4-hosts.conf.ww +++ b/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 From 8971b707f3073d12a429b5f923bed978cbbfb746 Mon Sep 17 00:00:00 2001 From: snehring Date: Wed, 1 May 2024 16:28:43 -0500 Subject: [PATCH 2/2] Add change to CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c4dcfa5..aaac14a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,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