Cleanups and minor fixups

internal/app/wwctl/configure/root.go

@@ -1,17 +1,17 @@
-package system
+package configure
 
 import (
 	"fmt"
-	"github.com/hpcng/warewulf/internal/app/wwctl/system/dhcp"
-	"github.com/hpcng/warewulf/internal/app/wwctl/system/tftp"
+	"github.com/hpcng/warewulf/internal/app/wwctl/configure/dhcp"
+	"github.com/hpcng/warewulf/internal/app/wwctl/configure/tftp"
 	"github.com/spf13/cobra"
 	"os"
 )
 
 var (
 	baseCmd = &cobra.Command{
-		Use:   "system",
-		Short: "Initialize Warewulf services",
+		Use:   "configure",
+		Short: "Configure Warewulf services",
 		Long:  "Warewulf Service Initialization",
 		RunE:  CobraRunE,
 	}

internal/app/wwctl/container/build/main.go

@@ -24,7 +24,13 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 			os.Exit(1)
 		}
 
-		container.Build(c, BuildForce)
+		output, err := container.Build(c, BuildForce)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "Could not build container %s: %s\n", c, err)
+			os.Exit(1)
+		} else {
+			fmt.Printf("%-20s: %s\n", c, output)
+		}
 	}
 
 	if SetDefault == true {

internal/app/wwctl/container/exec/main.go

@@ -36,5 +36,14 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		os.Exit(1)
 	}
 
+	fmt.Printf("Rebuilding container...\n")
+	output, err := container.Build(containerName, false)
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "Could not build container %s: %s\n", containerName, err)
+		os.Exit(1)
+	} else {
+		fmt.Printf("%s\n", output)
+	}
+
 	return nil
 }

internal/app/wwctl/container/pull/main.go

@@ -52,7 +52,13 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	}
 
 	fmt.Printf("Building container: %s\n", name)
-	container.Build(name, true)
+	output, err := container.Build(name, true)
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "Could not build container %s: %s\n", name, err)
+		os.Exit(1)
+	} else {
+		fmt.Printf("%s: %s\n", name, output)
+	}
 
 	if SetDefault == true {
 		nodeDB, err := node.New()

internal/app/wwctl/kernel/build/main.go

@@ -12,10 +12,12 @@ import (
 func CobraRunE(cmd *cobra.Command, args []string) error {
 
 	for _, arg := range args {
-		err := kernel.Build(arg)
+		output, err := kernel.Build(arg)
 		if err != nil {
 			wwlog.Printf(wwlog.ERROR, "Failed building kernel: %s\n", err)
 			os.Exit(1)
+		} else {
+			fmt.Printf("%s: %s\n", arg, output)
 		}
 	}
 

internal/app/wwctl/node/add/main.go

@@ -102,6 +102,17 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 			}
 		}
 
+		if SetDiscoverable == true {
+			wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting node to discoverable\n", n.Id.Get())
+
+			n.Discoverable.SetB(true)
+			err := nodeDB.NodeUpdate(n)
+			if err != nil {
+				wwlog.Printf(wwlog.ERROR, "%s\n", err)
+				os.Exit(1)
+			}
+		}
+
 	}
 
 	nodeDB.Persist()

internal/app/wwctl/node/add/root.go

@@ -10,13 +10,14 @@ var (
 		RunE:  CobraRunE,
 		Args:  cobra.MinimumNArgs(1),
 	}
-	SetGroup      string
-	SetController string
-	SetNetDev     string
-	SetIpaddr     string
-	SetNetmask    string
-	SetGateway    string
-	SetHwaddr     string
+	SetGroup        string
+	SetController   string
+	SetNetDev       string
+	SetIpaddr       string
+	SetNetmask      string
+	SetGateway      string
+	SetHwaddr       string
+	SetDiscoverable bool
 )
 
 func init() {
@@ -27,6 +28,7 @@ func init() {
 	baseCmd.PersistentFlags().StringVarP(&SetNetmask, "netmask", "M", "", "Set the node's network device netmask")
 	baseCmd.PersistentFlags().StringVarP(&SetGateway, "gateway", "G", "", "Set the node's network device gateway")
 	baseCmd.PersistentFlags().StringVarP(&SetHwaddr, "hwaddr", "H", "", "Set the node's network device HW address")
+	baseCmd.PersistentFlags().BoolVar(&SetDiscoverable, "discoverable", false, "Make this node discoverable")
 
 }
 

internal/app/wwctl/root.go

@@ -1,6 +1,7 @@
 package wwctl
 
 import (
+	"github.com/hpcng/warewulf/internal/app/wwctl/configure"
 	"github.com/hpcng/warewulf/internal/app/wwctl/container"
 	"github.com/hpcng/warewulf/internal/app/wwctl/kernel"
 	"github.com/hpcng/warewulf/internal/app/wwctl/node"
@@ -8,7 +9,6 @@ import (
 	"github.com/hpcng/warewulf/internal/app/wwctl/profile"
 	"github.com/hpcng/warewulf/internal/app/wwctl/ready"
 	"github.com/hpcng/warewulf/internal/app/wwctl/server"
-	"github.com/hpcng/warewulf/internal/app/wwctl/system"
 
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
 	"github.com/spf13/cobra"
@@ -38,7 +38,7 @@ func init() {
 	rootCmd.AddCommand(kernel.GetCommand())
 	//	rootCmd.AddCommand(group.GetCommand())
 	rootCmd.AddCommand(profile.GetCommand())
-	rootCmd.AddCommand(system.GetCommand())
+	rootCmd.AddCommand(configure.GetCommand())
 	rootCmd.AddCommand(ready.GetCommand())
 	rootCmd.AddCommand(server.GetCommand())
 

internal/pkg/container/build.go

@@ -2,6 +2,7 @@ package container
 
 import (
 	"fmt"
+	"github.com/hpcng/warewulf/internal/pkg/errors"
 	"github.com/hpcng/warewulf/internal/pkg/util"
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
 	"os"
@@ -9,46 +10,40 @@ import (
 	"path"
 )
 
-func Build(name string, buildForce bool) {
+func Build(name string, buildForce bool) (string, error) {
 
 	rootfsPath := RootFsDir(name)
 	imagePath := ImageFile(name)
 
 	if ValidSource(name) == false {
-		wwlog.Printf(wwlog.INFO, "%-35s: Skipping (bad path)\n", name)
-		return
+		return "", errors.New("Container does not exist")
 	}
 
 	if buildForce == false {
 		wwlog.Printf(wwlog.DEBUG, "Checking if there have been any updates to the VNFS directory\n")
 		if util.PathIsNewer(rootfsPath, imagePath) {
-			wwlog.Printf(wwlog.INFO, "%-35s: Skipping, VNFS is current\n", name)
-			return
+			return "Skipping (VNFS is current)", nil
 		}
 	}
 
 	wwlog.Printf(wwlog.DEBUG, "Making parent directory for: %s\n", name)
 	err := os.MkdirAll(path.Dir(imagePath), 0755)
 	if err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return
+		return "Failed creating directory", err
 	}
 
 	wwlog.Printf(wwlog.DEBUG, "Making parent directory for: %s\n", rootfsPath)
 	err = os.MkdirAll(path.Dir(rootfsPath), 0755)
 	if err != nil {
-		fmt.Printf("ERROR: %s\n", err)
-		return
+		return "Failed creating directory", err
 	}
 
 	wwlog.Printf(wwlog.DEBUG, "Building VNFS image: '%s' -> '%s'\n", rootfsPath, imagePath)
 	cmd := fmt.Sprintf("cd %s; find . | cpio --quiet -o -H newc | gzip -c > \"%s\"", rootfsPath, imagePath)
 	err = exec.Command("/bin/sh", "-c", cmd).Run()
 	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "Failed building VNFS: %s\n", err)
-		return
+		return "Failed building VNFS", err
 	}
 
-	wwlog.Printf(wwlog.INFO, "%-35s: Done\n", name)
-
+	return "Done", nil
 }

internal/pkg/kernel/kernel.go

@@ -69,7 +69,7 @@ func ListKernels() ([]string, error) {
 	return ret, nil
 }
 
-func Build(kernelVersion string) error {
+func Build(kernelVersion string) (string, error) {
 
 	kernelImage := "/boot/vmlinuz-" + kernelVersion
 	kernelDrivers := "/lib/modules/" + kernelVersion
@@ -81,20 +81,19 @@ func Build(kernelVersion string) error {
 	os.MkdirAll(path.Dir(driversDestination), 0755)
 
 	if util.IsFile(kernelImage) == false {
-		return errors.New("Could not locate kernel image: " + kernelImage)
+		return "", errors.New("Could not locate kernel image")
 	}
 
 	if util.IsDir(kernelDrivers) == false {
-		return errors.New("Could not locate kernel drivers: " + kernelDrivers)
+		return "", errors.New("Could not locate kernel drivers")
 	}
 
 	wwlog.Printf(wwlog.VERBOSE, "Setting up Kernel\n")
 	if _, err := os.Stat(kernelImage); err == nil {
 		err := util.CopyFile(kernelImage, kernelDestination)
 		if err != nil {
-			return err
+			return "", err
 		}
-		wwlog.Printf(wwlog.INFO, "%-45s: Done\n", "vmlinuz-"+kernelVersion)
 	}
 
 	wwlog.Printf(wwlog.VERBOSE, "Building Kernel driver image\n")
@@ -102,10 +101,9 @@ func Build(kernelVersion string) error {
 		cmd := fmt.Sprintf("cd /; find .%s | cpio --quiet -o -H newc -F \"%s\"", kernelDrivers, driversDestination)
 		err := exec.Command("/bin/sh", "-c", cmd).Run()
 		if err != nil {
-			return err
+			return "", err
 		}
-		wwlog.Printf(wwlog.INFO, "%-45s: Done\n", "kmods-"+kernelVersion+".img")
 	}
 
-	return nil
+	return "Done", nil
 }

internal/pkg/warewulfd/ipxe.go

@@ -57,11 +57,11 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
 		// If we failed to find a node, let's see if we can add one...
 		var netdev string
 
-		wwlog.Printf(wwlog.INFO, "Node was not found, looking for discoverable nodes...\n")
+		wwlog.Printf(wwlog.VERBOSE, "Node was not found, looking for discoverable nodes...\n")
 
 		n, netdev, err = nodeDB.FindDiscoverableNode()
 		if err != nil {
-			wwlog.Printf(wwlog.WARN, "Node was not found, no nodes are discoverable...\n")
+			wwlog.Printf(wwlog.WARN, "No nodes are set as discoverable...\n")
 			unconfiguredNode = true
 
 		} else {
@@ -79,7 +79,9 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
 					wwlog.Printf(wwlog.ERROR, "Could not persist new node configuration while adding node: %s\n", n.Id.Get())
 					unconfiguredNode = true
 				} else {
+					wwlog.Printf(wwlog.INFO, "Building System Overlay:\n")
 					_ = overlay.BuildSystemOverlay([]node.NodeInfo{n})
+					wwlog.Printf(wwlog.INFO, "Building Runtime Overlay:\n")
 					_ = overlay.BuildRuntimeOverlay([]node.NodeInfo{n})
 				}
 			}
@@ -89,9 +91,7 @@ func IpxeSend(w http.ResponseWriter, req *http.Request) {
 	if unconfiguredNode == true {
 		log.Printf("UNCONFIGURED NODE:  %15s\n", hwaddr)
 
-		ipxeTemplate := fmt.Sprintf("/etc/warewulf/ipxe/unconfigured.ipxe", n.Ipxe.Get())
-
-		tmpl, err := template.ParseFiles(ipxeTemplate)
+		tmpl, err := template.ParseFiles("/etc/warewulf/ipxe/unconfigured.ipxe")
 		if err != nil {
 			wwlog.Printf(wwlog.ERROR, "%s\n", err)
 			return