From 9050622f6861dd99e175b0db349359c129e8882c Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 10 Jul 2024 16:06:06 -0400 Subject: [PATCH] Ensure autobuilt overlays include contextual overlay contents. Following #1249, autobuilt overlays were being built with no contents. This change follows the pattern in `wwctl overlay build` to include configured overlays when none are explicitly specified. Inspired by #1296. Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 6 ++++++ internal/pkg/warewulfd/util.go | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9479e7ef..ce4f6da0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Replace slice in templates with sprig substr. #1093 - Fix an invalid format issue for the GitHub nightly build action. #1258 +## v4.5.6, unreleased + +### Fixed + +- Ensure autobuilt overlays include contextual overlay contents. #1296 + ## v4.5.5, 2024-07-05 ### Fixed diff --git a/internal/pkg/warewulfd/util.go b/internal/pkg/warewulfd/util.go index 1211beb5..d955f772 100644 --- a/internal/pkg/warewulfd/util.go +++ b/internal/pkg/warewulfd/util.go @@ -63,7 +63,11 @@ func getOverlayFile( } if build { - err = overlay.BuildOverlay(n, context, stage_overlays) + if len(stage_overlays) > 0 { + err = overlay.BuildSpecificOverlays([]node.NodeInfo{n}, stage_overlays) + } else { + err = overlay.BuildAllOverlays([]node.NodeInfo{n}) + } if err != nil { wwlog.Error("Failed to build overlay: %s, %s, %s\n%s", n.Id.Get(), stage_overlays, stage_file, err)