From 09ad83b02fb6546f0695187d92ba0900f04967ab Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 17 Jan 2023 16:03:07 +0100 Subject: [PATCH] add TMPDIR --- Makefile | 3 ++- internal/pkg/buildconfig/defaults.go | 6 ++++++ internal/pkg/buildconfig/setconfigs.go.in | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b494dd69..310d38b5 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ endif TFTPDIR ?= /var/lib/tftpboot # Warewulf directory paths -VARLIST += WWCLIENTDIR WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR WWDATADIR +VARLIST += WWCLIENTDIR WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR WWDATADIR TMPDIR WWCONFIGDIR := $(SYSCONFDIR)/$(WAREWULF) WWPROVISIONDIR := $(SRVDIR)/$(WAREWULF) WWOVERLAYDIR := $(LOCALSTATEDIR)/$(WAREWULF)/overlays @@ -76,6 +76,7 @@ WWTFTPDIR := $(TFTPDIR)/$(WAREWULF) WWDOCDIR := $(DOCDIR)/$(WAREWULF) WWDATADIR := $(DATADIR)/$(WAREWULF) WWCLIENTDIR ?= /warewulf +TMPDIR ?= /var/tmp # auto installed tooling TOOLS_DIR := .tools diff --git a/internal/pkg/buildconfig/defaults.go b/internal/pkg/buildconfig/defaults.go index 24cb2d40..332a2f6d 100644 --- a/internal/pkg/buildconfig/defaults.go +++ b/internal/pkg/buildconfig/defaults.go @@ -19,6 +19,7 @@ var ( release string = "UNDEF" wwclientdir string = "UNDEF" datadir string = "UNDEF" + tmpdir string = "UNDEF" ) func BINDIR() string { @@ -90,3 +91,8 @@ func WWCLIENTDIR() string { wwlog.Debug("WWCLIENTDIR = '%s'", wwclientdir) return wwclientdir } + +func TMPDIR() string { + wwlog.Debug("TMPDIR = '%s'", tmpdir) + return tmpdir +} diff --git a/internal/pkg/buildconfig/setconfigs.go.in b/internal/pkg/buildconfig/setconfigs.go.in index e10303e3..f049ffeb 100644 --- a/internal/pkg/buildconfig/setconfigs.go.in +++ b/internal/pkg/buildconfig/setconfigs.go.in @@ -15,4 +15,5 @@ func init() { version = "@VERSION@" release = "@RELEASE@" wwclientdir = "@WWCLIENTDIR@" + tmpdir = "@TMPDIR@" }