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>
52 lines
1.1 KiB
Go
52 lines
1.1 KiB
Go
package configure
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
|
|
"github.com/hpcng/warewulf/internal/pkg/buildconfig"
|
|
"github.com/hpcng/warewulf/internal/pkg/util"
|
|
"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
|
|
"github.com/hpcng/warewulf/internal/pkg/wwlog"
|
|
)
|
|
|
|
var tftpdir string = path.Join(buildconfig.TFTPDIR(), "warewulf")
|
|
|
|
func TFTP() error {
|
|
controller, err := warewulfconf.New()
|
|
if err != nil {
|
|
wwlog.Error("%s", err)
|
|
return err
|
|
}
|
|
|
|
err = os.MkdirAll(tftpdir, 0755)
|
|
if err != nil {
|
|
wwlog.Error("%s", err)
|
|
return err
|
|
}
|
|
|
|
fmt.Printf("Writing PXE files to: %s\n", tftpdir)
|
|
for _, f := range [4]string{"x86_64.efi", "x86_64.kpxe", "arm64.efi"} {
|
|
err = util.SafeCopyFile(path.Join(buildconfig.DATADIR(), "warewulf", "ipxe", f), path.Join(tftpdir, f))
|
|
if err != nil {
|
|
wwlog.Error("%s", err)
|
|
return err
|
|
}
|
|
}
|
|
|
|
if !controller.Tftp.Enabled {
|
|
wwlog.Info("Warewulf does not auto start TFTP services due to disable by warewulf.conf")
|
|
os.Exit(0)
|
|
}
|
|
|
|
fmt.Printf("Enabling and restarting the TFTP services\n")
|
|
err = util.SystemdStart(controller.Tftp.SystemdName)
|
|
if err != nil {
|
|
wwlog.Error("%s", err)
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|