From b68a0faf6dc40f1b265da15da98ed33d4b3f88f4 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 16 Feb 2024 22:27:43 -0700 Subject: [PATCH] Remove redundant wwclient startup script 80-wwclient was previously supplanted by 80-wwclient.ww, but the static version was retained. Meanwhile, the static version can only detect systemd when it is running, which it isn't during wwinit. This led to wwclient starting during wwinit and then being killed by systemd. Closes #1066 Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 1 + overlays/wwinit/warewulf/init.d/80-wwclient | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 overlays/wwinit/warewulf/init.d/80-wwclient diff --git a/CHANGELOG.md b/CHANGELOG.md index f126bdfd..97277225 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Change too-verbose warning message level from `Warn` to `Debug`. #1025 - Fixed a bug where error occurs when editing node. #1024 - Optionally detect network and netmask from CIDR IP address. #1016 +- Fix startup of wwclient on systemd hosts #1066 ### Changed diff --git a/overlays/wwinit/warewulf/init.d/80-wwclient b/overlays/wwinit/warewulf/init.d/80-wwclient deleted file mode 100644 index 38347110..00000000 --- a/overlays/wwinit/warewulf/init.d/80-wwclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -. /warewulf/config -# Only start if the systemd is no available -test -d /run/systemd/system && exit 0 -echo "Starting wwclient" -nohup /warewulf/wwclient >/var/log/wwclient.log 2>&1