Merge pull request warewulf#894 from mslacken/FixProvisionBuild

calling the overlay build functions direclty

internal/pkg/overlay/overlay.go

@@ -19,25 +19,9 @@ import (
 	"github.com/pkg/errors"
 )
 
-/*
-
-func BuildSystemOverlay(nodeList []node.NodeInfo) error {
-	return nil
-}
-
-func BuildRuntimeOverlay(nodeList []node.NodeInfo) error {
-	return nil
-}
-
-
-func FindSystemOverlays() ([]string, error) {
-	return findAllOverlays("system")
-}
-
-func FindRuntimeOverlays() ([]string, error) {
-	return findAllOverlays("runtime")
-}
-*/
+var (
+	ErrDoesNotExist = errors.New("overlay does not exist")
+)
 
 /*
 Build all overlays (runtime and generic) for a node
@@ -141,6 +125,9 @@ func OverlayInit(overlayName string) error {
 Build the given overlays for a node and create a Image for them
 */
 func BuildOverlay(nodeInfo node.NodeInfo, context string, overlayNames []string) error {
+	if len(overlayNames) == 0 {
+		return nil
+	}
 	// create the dir where the overlay images will reside
 	name := fmt.Sprintf("overlay %s/%v", nodeInfo.Id.Get(), overlayNames)
 	overlayImage := OverlayImage(nodeInfo.Id.Get(), context, overlayNames)
@@ -187,7 +174,7 @@ exists it will be created.
 */
 func BuildOverlayIndir(nodeInfo node.NodeInfo, overlayNames []string, outputDir string) error {
 	if len(overlayNames) == 0 {
-		return errors.New("At least one valid overlay is needed to build for a node")
+		return nil
 	}
 	if !util.IsDir(outputDir) {
 		return errors.Errorf("output must a be a directory: %s", outputDir)
@@ -204,14 +191,10 @@ func BuildOverlayIndir(nodeInfo node.NodeInfo, overlayNames []string, outputDir
 	for _, overlayName := range overlayNames {
 		wwlog.Verbose("Building overlay %s for node %s in %s", overlayName, nodeInfo.Id.Get(), outputDir)
 		overlaySourceDir := OverlaySourceDir(overlayName)
-		wwlog.Debug("Starting to build overlay %s\nChanging directory to OverlayDir: %s", overlayName, overlaySourceDir)
+		wwlog.Debug("Changing directory to OverlayDir: %s", overlaySourceDir)
 		err := os.Chdir(overlaySourceDir)
 		if err != nil {
-			return errors.Wrap(err, "could not change directory to overlay dir")
-		}
-		wwlog.Debug("Checking to see if overlay directory exists: %s", overlaySourceDir)
-		if !util.IsDir(overlaySourceDir) {
-			return errors.New("overlay does not exist: " + overlayName)
+			return errors.Wrapf(ErrDoesNotExist, "directory: %s name: %s", overlaySourceDir, overlayName)
 		}
 
 		wwlog.Verbose("Walking the overlay structure: %s", overlaySourceDir)