From a7ec22744eb343954826368e898cadc72868659c Mon Sep 17 00:00:00 2001 From: griznog Date: Fri, 24 Nov 2023 10:29:39 -0600 Subject: [PATCH] Make WWPROVISIONDIR a first class citizen of the local/shared state location. --- CHANGELOG.md | 2 ++ Variables.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5183379f..c2f30884 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - New build for Rocky Linux 9 ### Fixed +- Make Variables.mk consistent with spec file w.r.t. WWPROVISIONDIR, e.g. + instead of basing in `/srv`, handle it the same as chroots and overlays. - Enable spec file to work with Fedora - Fix hard CPU architecture on proto's installation in the Makefile - More aggressive `make clean`. diff --git a/Variables.mk b/Variables.mk index 8ff5426a..c405e450 100644 --- a/Variables.mk +++ b/Variables.mk @@ -70,7 +70,7 @@ TFTPDIR ?= /var/lib/tftpboot # Warewulf directory paths VARLIST += WWCLIENTDIR WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR WWDATADIR WWCONFIGDIR := $(SYSCONFDIR)/$(WAREWULF) -WWPROVISIONDIR := $(SRVDIR)/$(WAREWULF) +WWPROVISIONDIR := $(LOCALSTATEDIR)/$(WAREWULF)/provision WWOVERLAYDIR := $(LOCALSTATEDIR)/$(WAREWULF)/overlays WWCHROOTDIR := $(LOCALSTATEDIR)/$(WAREWULF)/chroots WWTFTPDIR := $(TFTPDIR)/$(WAREWULF)