kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed Warewulfd and systemd

Browse Source
This commit is contained in:
Gregory Kurtzer
2021-04-24 16:49:06 -07:00
parent 1e0b86b71c
commit d1bae3582b
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -67,6 +67,7 @@ files: all
mkdir -p $(DESTDIR)/usr/lib/systemd/system 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/firewalld/warewulf.xml $(DESTDIR)/usr/lib/firewalld/services
install -c -m 0644 include/systemd/warewulfd.service $(DESTDIR)/usr/lib/systemd/system install -c -m 0644 include/systemd/warewulfd.service $(DESTDIR)/usr/lib/systemd/system
systemctl daemon-reload
# cp -r tftpboot/* /var/lib/tftpboot/warewulf/ipxe/ # cp -r tftpboot/* /var/lib/tftpboot/warewulf/ipxe/
# restorecon -r /var/lib/tftpboot/warewulf # restorecon -r /var/lib/tftpboot/warewulf

2
include/systemd/warewulfd.service
View File

@@ -7,7 +7,7 @@ AssertFileIsExecutable=/usr/bin/wwctl
[Service] [Service]
Type=forking Type=forking
User=root User=root
Group=warewulf Group=root
ExecStart=/usr/bin/wwctl server start ExecStart=/usr/bin/wwctl server start
PIDFile=/tmp/warewulfd.pid PIDFile=/tmp/warewulfd.pid

4
internal/pkg/warewulfd/daemon.go
View File

@@ -7,7 +7,6 @@ import (
"os/exec" "os/exec"
"strconv" "strconv"
"syscall" "syscall"
"time"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
@@ -46,9 +45,6 @@ func DaemonStart() error {
p.Close() p.Close()
time.Sleep(1 * time.Second)
DaemonStatus()
} }
return nil return nil