Properly support relative paths to the SYSCONFDIR

internal/pkg/overlay/funcmap.go

@@ -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)
 	}

overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_dsa_key.pub"}}
+{{Include "keys/ssh_host_dsa_key.pub"}}

overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_dsa_key"}}
+{{Include "keys/ssh_host_dsa_key"}}

overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_ecdsa_key.pub"}}
+{{Include "keys/ssh_host_ecdsa_key.pub"}}

overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_ecdsa_key"}}
+{{Include "keys/ssh_host_ecdsa_key"}}

overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_ed25519_key.pub"}}
+{{Include "keys/ssh_host_ed25519_key.pub"}}

overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_ed25519_key"}}
+{{Include "keys/ssh_host_ed25519_key"}}

overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_rsa_key.pub"}}
+{{Include "keys/ssh_host_rsa_key.pub"}}

overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_rsa_key"}}
+{{Include "keys/ssh_host_rsa_key"}}

overlays/wwinit/etc/warewulf/warewulf.conf.ww

@@ -1 +1 @@
-{{Include "/etc/warewulf/warewulf.conf"}}
+{{Include "warewulf.conf"}}