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

Merge pull request #257 from gmkurtzer/various_relocation_fixes

Browse Source 
Various relocation fixes
This commit is contained in:
Gregory M. Kurtzer
2022-01-25 19:59:32 -08:00
committed by GitHub
parent 861e157de0 2d880aae76
commit ef30ebfb8a
12 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/pkg/overlay/funcmap.go
View File

@@ -5,14 +5,18 @@ import (
"path"
"strings"
"github.com/hpcng/warewulf/internal/pkg/buildconfig"
"github.com/hpcng/warewulf/internal/pkg/container"
"github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/wwlog"
)
func templateFileInclude(path string) string {
wwlog.Printf(wwlog.DEBUG, "Including file into template: %s\n", path)
content, err := ioutil.ReadFile(path)
func templateFileInclude(inc string) string {
if !strings.HasPrefix(inc, "/") {
inc = path.Join(buildconfig.SYSCONFDIR(), "warewulf", inc)
}
wwlog.Printf(wwlog.DEBUG, "Including file into template: %s\n", inc)
content, err := ioutil.ReadFile(inc)
if err != nil {
wwlog.Printf(wwlog.VERBOSE, "Could not include file into template: %s\n", err)
}