Make mkfs -f/-F flag selection more explicit

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
2025-12-17 15:11:09 -07:00
parent c674728c09
commit 8bf2e115a9
2 changed files with 3 additions and 3 deletions
--- 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 }}