From 8bf2e115a9b99e445f542ffa9e3a709928528ae2 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 17 Dec 2025 15:11:09 -0700 Subject: [PATCH] Make mkfs -f/-F flag selection more explicit Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 2 +- overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b0dbd03..4228de84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - Remove unused Netdev `Prefix` field. -- Fixed mkfs overlay overwrite/force-flag behavior. #2028. ### Fixed @@ -46,6 +45,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix ImageDelete API not returning error when checking if image is used by nodes/profiles - Fix warewulf-dracut to not run the wwinit module if root is not set to `root=wwclient*` - Fix `wwctl image import --update` #2066 +- Fix filesystem overwrite/force behavior in mkfs overlay. #2028 ### Dependencies diff --git a/overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww b/overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww index 1f468100..147de24b 100644 --- a/overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww +++ b/overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww @@ -59,9 +59,9 @@ if command -v mkfs >/dev/null ; then : info "warewulf: mkfs: formatting {{ $fs.device }}" {{- $forceFlag := "" }} {{- if $fs.overwrite }} - {{- if eq $fs.type "ext4" }} + {{- if regexMatch "^ext[234]$" $fs.type }} {{- $forceFlag = "-F" }} - {{- else }} + {{- else if regexMatch "^(xfs|btrfs)$" $fs.type }} {{- $forceFlag = "-f" }} {{- end }} {{- end }}