0b3e862bea
I noticed that some wwlog calls included a trailing newline, but others did not. I tested both in isolation and discovered that the behavior was consistent regardless of whether a trailing newline was included. I further confirmed in code that wwlog appends a trailing newline automatically if it is not present; so a trailing newline is unnecessary in individual calls. This commit removes trailing newlines from all calls to make them consistent. It also replaces two calls to wwlog.Printf. (see #534) Signed-off-by: Jonathon Anderson <janderson@ciq.co>
56 lines
1.3 KiB
Go
56 lines
1.3 KiB
Go
package configure
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/hpcng/warewulf/internal/pkg/overlay"
|
|
"github.com/hpcng/warewulf/internal/pkg/util"
|
|
"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
|
|
"github.com/hpcng/warewulf/internal/pkg/wwlog"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
/*
|
|
Configures the dhcpd server, when show is set to false, else the
|
|
dhcp configuration is checked.
|
|
*/
|
|
func Dhcp() error {
|
|
|
|
controller, err := warewulfconf.New()
|
|
if err != nil {
|
|
wwlog.Error("%s", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
if !controller.Dhcp.Enabled {
|
|
wwlog.Info("This system is not configured as a Warewulf DHCP controller")
|
|
os.Exit(1)
|
|
}
|
|
|
|
if controller.Dhcp.RangeStart == "" {
|
|
wwlog.Error("Configuration is not defined: `dhcpd range start`")
|
|
os.Exit(1)
|
|
}
|
|
|
|
if controller.Dhcp.RangeEnd == "" {
|
|
wwlog.Error("Configuration is not defined: `dhcpd range end`")
|
|
os.Exit(1)
|
|
}
|
|
if controller.Warewulf.EnableHostOverlay {
|
|
err = overlay.BuildHostOverlay()
|
|
if err != nil {
|
|
wwlog.Warn("host overlay could not be built: %s", err)
|
|
}
|
|
} else {
|
|
wwlog.Info("host overlays are disabled, did not modify/create dhcpd configuration")
|
|
}
|
|
fmt.Printf("Enabling and restarting the DHCP services\n")
|
|
err = util.SystemdStart(controller.Dhcp.SystemdName)
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to start")
|
|
}
|
|
|
|
return nil
|
|
}
|