bug fixes

Makefile

@@ -75,7 +75,7 @@ wwclient:
 
 clean:
 	rm -f warewulfd
-	rm -f wwbuild
+	rm -f wwclient
 	rm -f wwctl
 
 install: files services

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

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

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)

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)

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

overlays/runtime/default/root/.ssh/authorized_keys.ww

@@ -1 +1 @@
-{{Include "/root/.ssh/authorized_keys")}}
+{{Include "/root/.ssh/authorized_keys"}}