kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Show each overlay only once #1675

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-01-30 04:59:54 -07:00
committed by Christian Goll
parent 9fe7d70d18
commit 4f83885c5b
16 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/pkg/overlay/overlay.go
View File

@@ -205,25 +205,29 @@ func BuildHostOverlay() error {
/*
Get all overlays present in warewulf
*/
func FindOverlays() (overlayList []string, err error) {
func FindOverlays() (overlayList []string) {
dotfilecheck, _ := regexp.Compile(`^\..*`)
controller := config.Get()
var files []fs.DirEntry
if distfiles, err := os.ReadDir(controller.Paths.DistributionOverlaydir()); err == nil {
if distfiles, err := os.ReadDir(controller.Paths.DistributionOverlaydir()); err != nil {
wwlog.Warn("error reading overlays from %s: %s", controller.Paths.DistributionOverlaydir(), err)
} else {
files = append(files, distfiles...)
}
if sitefiles, err := os.ReadDir(path.Join(controller.Paths.SiteOverlaydir())); err == nil {
if sitefiles, err := os.ReadDir(controller.Paths.SiteOverlaydir()); err != nil {
wwlog.Warn("error reading overalys from %s: %s", controller.Paths.SiteOverlaydir(), err)
} else {
files = append(files, sitefiles...)
}
for _, file := range files {
wwlog.Debug("Evaluating overlay source: %s", file.Name())
isdotfile := dotfilecheck.MatchString(file.Name())
if (file.IsDir()) && !(isdotfile) {
if file.IsDir() && !isdotfile && !util.InSlice(overlayList, file.Name()) {
overlayList = append(overlayList, file.Name())
}
}
return overlayList, nil
return overlayList
}
/*