From d1bae3582bf71bf49563c4543fc7da1d554ed4d2 Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Sat, 24 Apr 2021 16:49:06 -0700
Subject: [PATCH] Fixed Warewulfd and systemd

---
 Makefile                          | 1 +
 include/systemd/warewulfd.service | 2 +-
 internal/pkg/warewulfd/daemon.go  | 4 ----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index fdecde84..3df97406 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ files: all
 	mkdir -p $(DESTDIR)/usr/lib/systemd/system
 	install -c -m 0644 include/firewalld/warewulf.xml $(DESTDIR)/usr/lib/firewalld/services
 	install -c -m 0644 include/systemd/warewulfd.service $(DESTDIR)/usr/lib/systemd/system
+	systemctl daemon-reload
 #	cp -r tftpboot/* /var/lib/tftpboot/warewulf/ipxe/
 #	restorecon -r /var/lib/tftpboot/warewulf
 
diff --git a/include/systemd/warewulfd.service b/include/systemd/warewulfd.service
index 49fcfaeb..d8abf5ac 100644
--- a/include/systemd/warewulfd.service
+++ b/include/systemd/warewulfd.service
@@ -7,7 +7,7 @@ AssertFileIsExecutable=/usr/bin/wwctl
 [Service]
 Type=forking
 User=root
-Group=warewulf
+Group=root
 
 ExecStart=/usr/bin/wwctl server start
 PIDFile=/tmp/warewulfd.pid
diff --git a/internal/pkg/warewulfd/daemon.go b/internal/pkg/warewulfd/daemon.go
index c28ca1e9..da3a59bf 100644
--- a/internal/pkg/warewulfd/daemon.go
+++ b/internal/pkg/warewulfd/daemon.go
@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"strconv"
 	"syscall"
-	"time"
 
 	"github.com/hpcng/warewulf/internal/pkg/util"
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
@@ -46,9 +45,6 @@ func DaemonStart() error {
 
 		p.Close()
 
-		time.Sleep(1 * time.Second)
-
-		DaemonStatus()
 	}
 
 	return nil