From 0c3a58e47af8d3d97e759de9fae1c9c3f69e69f1 Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Wed, 11 Nov 2020 00:34:03 -0800
Subject: [PATCH] bug fixes

---
 Makefile                                                      | 2 +-
 cmd/warewulfd/warewulfd.go                                    | 4 ++--
 cmd/wwclient/wwclient.go                                      | 2 +-
 internal/app/wwctl/build/kernel/kernel.go                     | 2 +-
 internal/app/wwctl/build/runtime-overlay/runtime-overlay.go   | 2 +-
 internal/app/wwctl/build/system-overlay/system-overlay.go     | 2 +-
 overlays/runtime/default/root/.ssh/authorized_keys.ww         | 2 +-
 .../network-scripts/{ifcfg-eth0.in => ifcfg-eth0.ww}          | 0
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename overlays/system/default/etc/sysconfig/network-scripts/{ifcfg-eth0.in => ifcfg-eth0.ww} (100%)

diff --git a/Makefile b/Makefile
index f792b785..05c0cf58 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ wwclient:
 
 clean:
 	rm -f warewulfd
-	rm -f wwbuild
+	rm -f wwclient
 	rm -f wwctl
 
 install: files services
diff --git a/cmd/warewulfd/warewulfd.go b/cmd/warewulfd/warewulfd.go
index b9b84552..1cf34ed0 100644
--- a/cmd/warewulfd/warewulfd.go
+++ b/cmd/warewulfd/warewulfd.go
@@ -66,8 +66,8 @@ func main() {
 	http.HandleFunc("/kernel/", kernelSend)
 	http.HandleFunc("/kmods/", kmodsSend)
 	http.HandleFunc("/vnfs/", vnfsSend)
-	http.HandleFunc("/system-overlay-system/", systemOverlaySend)
-	http.HandleFunc("/system-overlay-runtime", runtimeOverlaySend)
+	http.HandleFunc("/overlay-system/", systemOverlaySend)
+	http.HandleFunc("/overlay-runtime", runtimeOverlaySend)
 
 	http.ListenAndServe(":9873", nil)
 }
diff --git a/cmd/wwclient/wwclient.go b/cmd/wwclient/wwclient.go
index 0f71894b..6153639d 100644
--- a/cmd/wwclient/wwclient.go
+++ b/cmd/wwclient/wwclient.go
@@ -61,7 +61,7 @@ func main() {
 		for true {
 			var err error
 
-			getString := fmt.Sprintf("http://%s:%d/system-overlay-runtime", config.Ipaddr, config.Port)
+			getString := fmt.Sprintf("http://%s:%d/overlay-runtime", config.Ipaddr, config.Port)
 			resp, err = webclient.Get(getString)
 			if err == nil {
 				break
diff --git a/internal/app/wwctl/build/kernel/kernel.go b/internal/app/wwctl/build/kernel/kernel.go
index 3023264f..3f3670e7 100644
--- a/internal/app/wwctl/build/kernel/kernel.go
+++ b/internal/app/wwctl/build/kernel/kernel.go
@@ -53,7 +53,7 @@ func Build(nodeList []assets.NodeInfo, force bool) error {
 
 		if _, err := os.Stat(kernelDrivers); err == nil {
 			if util.PathIsNewer(kernelDrivers, driversDestination) && force == false {
-				wwlog.Printf(wwlog.INFO, "%-35s: Skipping, kernel Drivers are current\n", "kmods-"+kernelVersion+".img")
+				wwlog.Printf(wwlog.INFO, "%-35s: Skipping, drivers are current\n", "kmods-"+kernelVersion+".img")
 
 			} else {
 				cmd := fmt.Sprintf("cd /; find .%s | cpio --quiet -o -H newc -F \"%s\"", kernelDrivers, driversDestination)
diff --git a/internal/app/wwctl/build/runtime-overlay/runtime-overlay.go b/internal/app/wwctl/build/runtime-overlay/runtime-overlay.go
index 49be8543..92e9de0b 100644
--- a/internal/app/wwctl/build/runtime-overlay/runtime-overlay.go
+++ b/internal/app/wwctl/build/runtime-overlay/runtime-overlay.go
@@ -130,7 +130,7 @@ func Build(nodeList []assets.NodeInfo, force bool) error {
 				wwlog.Printf(wwlog.ERROR, "Could not generate runtime image overlay: %s\n", err)
 				continue
 			}
-			wwlog.Printf(wwlog.INFO, "%-3s: Done\n", node.Fqdn)
+			wwlog.Printf(wwlog.INFO, "%-35s: Done\n", node.Fqdn)
 
 			wwlog.Printf(wwlog.DEBUG, "Removing temporary directory: %s\n", tmpDir)
 			os.RemoveAll(tmpDir)
diff --git a/internal/app/wwctl/build/system-overlay/system-overlay.go b/internal/app/wwctl/build/system-overlay/system-overlay.go
index f4291747..89448be5 100644
--- a/internal/app/wwctl/build/system-overlay/system-overlay.go
+++ b/internal/app/wwctl/build/system-overlay/system-overlay.go
@@ -87,7 +87,7 @@ func Build(nodeList []assets.NodeInfo, force bool) error {
 
 					destFile := strings.TrimSuffix(location, ".ww")
 
-					tmpl, err := template.New(path.Base(location)).Funcs(template.FuncMap{"include": fileInclude}).ParseGlob(path.Join(OverlayDir, destFile + ".ww*"))
+					tmpl, err := template.New(path.Base(location)).Funcs(template.FuncMap{"Include": fileInclude}).ParseGlob(path.Join(OverlayDir, destFile + ".ww*"))
 					if err != nil {
 						wwlog.Printf(wwlog.ERROR, "%s\n", err)
 						return err
diff --git a/overlays/runtime/default/root/.ssh/authorized_keys.ww b/overlays/runtime/default/root/.ssh/authorized_keys.ww
index 01b8c625..6ec927da 100644
--- a/overlays/runtime/default/root/.ssh/authorized_keys.ww
+++ b/overlays/runtime/default/root/.ssh/authorized_keys.ww
@@ -1 +1 @@
-{{Include "/root/.ssh/authorized_keys")}}
+{{Include "/root/.ssh/authorized_keys"}}
diff --git a/overlays/system/default/etc/sysconfig/network-scripts/ifcfg-eth0.in b/overlays/system/default/etc/sysconfig/network-scripts/ifcfg-eth0.ww
similarity index 100%
rename from overlays/system/default/etc/sysconfig/network-scripts/ifcfg-eth0.in
rename to overlays/system/default/etc/sysconfig/network-scripts/ifcfg-eth0.ww