Merge pull request #994 from hpcng/make-variables-consistent-with-spe…

…cfile

Make WWPROVISIONDIR a first class citizen of the local/shared state location.

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`.

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)