Merge branch 'main' of https://github.com/ctrliq/warewulf into main

etc/dhcp/default-dhcpd.conf

@@ -1,6 +1,6 @@
 # This file is created and was written by a Warewulf template. It is strongly
 # suggested that you do not edit this file, but rather, edit the template and
-# recreate this file using Warewulf (wwctl services dhcp)
+# recreate this file using Warewulf (wwctl configure dhcp)
 
 allow booting;
 allow bootp;

etc/dhcp/static-dhcpd.conf

@@ -1,6 +1,6 @@
 # This file is created and was written by a Warewulf template. It is strongly
 # suggested that you do not edit this file, but rather, edit the template and
-# recreate this file using Warewulf (wwctl services dhcp)
+# recreate this file using Warewulf (wwctl configure dhcp)
 
 allow booting;
 allow bootp;

internal/app/wwctl/configure/dhcp/root.go

@@ -18,7 +18,7 @@ var (
 
 func init() {
 	baseCmd.PersistentFlags().BoolVarP(&SetShow, "show", "s", false, "Show configuration (don't update)")
-	baseCmd.PersistentFlags().BoolVar(&SetShow, "persist", false, "Persist the configuration and initialize the service")
+	baseCmd.PersistentFlags().BoolVar(&SetPersist, "persist", false, "Persist the configuration and initialize the service")
 }
 
 // GetRootCommand returns the root cobra.Command for the application.

internal/pkg/overlay/overlay.go

@@ -127,7 +127,7 @@ func buildOverlay(nodeList []node.NodeInfo, overlayType string) error {
 		} else if overlayType == "system" {
 			wwlog.Printf(wwlog.VERBOSE, "Building system overlay for: %s\n", n.Id.Get())
 
-			OverlayDir = config.SystemOverlaySource(n.RuntimeOverlay.Get())
+			OverlayDir = config.SystemOverlaySource(n.SystemOverlay.Get())
 			OverlayFile = config.SystemOverlayImage(n.Id.Get())
 		} else {
 			wwlog.Printf(wwlog.ERROR, "overlayType requested is not supported: %s\n", overlayType)

warewulf.spec.in

@@ -45,4 +45,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Jan 26 14:46:24 JST 2021 Brian Clemens <bclemens@ctrliq.com> - 4.0.0
-- Initial release
+- Initial release