From 7842f41f62e2cec2196bfe626ec801ecd988f248 Mon Sep 17 00:00:00 2001 From: kosmolito Date: Wed, 5 Nov 2025 21:00:42 +0000 Subject: [PATCH] fix(mkfs): trim template whitespace; add changelog; add contributor Signed-off-by: kosmolito --- CHANGELOG.md | 2 ++ CONTRIBUTORS.md | 2 +- overlays/mkfs/internal/mkfs_test.go | 6 +++--- overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a888d05b..2502def9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## v4.6.5, unreleased +- Fixed mkfs overlay overwrite/force-flag behavior. #2028. + ### Added - `wwclient.aarch64` overlay always provides an aarch64 wwclient executable. diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c9962cdb..919fd1c8 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -49,4 +49,4 @@ * Arian Cabrera [@acabrera86](https://github.com/acabrera86) * Dacian Reece-Stremtan [@dacianstremtan](https://github.com/dacianstremtan) * Adrian Reber -* Karker Said +* Karker Said [@kosmolito](https://github.com/kosmolito) diff --git a/overlays/mkfs/internal/mkfs_test.go b/overlays/mkfs/internal/mkfs_test.go index b7415936..aeed60db 100644 --- a/overlays/mkfs/internal/mkfs_test.go +++ b/overlays/mkfs/internal/mkfs_test.go @@ -105,13 +105,13 @@ already_formatted() { if command -v mkfs >/dev/null ; then : if false || ! already_formatted /dev/disk/by-partlabel/rootfs; then info "warewulf: mkfs: formatting /dev/disk/by-partlabel/rootfs" - mkfs --type=ext4 /dev/disk/by-partlabel/rootfs || die "warewulf: mkfs: failed to format /dev/disk/by-partlabel/rootfs" + mkfs --type=ext4 /dev/disk/by-partlabel/rootfs || die "warewulf: mkfs: failed to format /dev/disk/by-partlabel/rootfs" else info "warewulf: mkfs: skipping /dev/disk/by-partlabel/rootfs" fi if true || ! already_formatted /dev/disk/by-partlabel/scratch; then info "warewulf: mkfs: formatting /dev/disk/by-partlabel/scratch" - mkfs --type=ext4 -F /dev/disk/by-partlabel/scratch || die "warewulf: mkfs: failed to format /dev/disk/by-partlabel/scratch" + mkfs --type=ext4 -F /dev/disk/by-partlabel/scratch || die "warewulf: mkfs: failed to format /dev/disk/by-partlabel/scratch" else info "warewulf: mkfs: skipping /dev/disk/by-partlabel/scratch" fi @@ -171,7 +171,7 @@ already_formatted() { if command -v mkfs >/dev/null ; then : if false || ! already_formatted /dev/disk/by-partlabel/rootfs; then info "warewulf: mkfs: formatting /dev/disk/by-partlabel/rootfs" - mkfs --type=ext4 /dev/disk/by-partlabel/rootfs || die "warewulf: mkfs: failed to format /dev/disk/by-partlabel/rootfs" + mkfs --type=ext4 /dev/disk/by-partlabel/rootfs || die "warewulf: mkfs: failed to format /dev/disk/by-partlabel/rootfs" else info "warewulf: mkfs: skipping /dev/disk/by-partlabel/rootfs" fi 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 1e1aea89..1f468100 100644 --- a/overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww +++ b/overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww @@ -65,7 +65,7 @@ if command -v mkfs >/dev/null ; then : {{- $forceFlag = "-f" }} {{- end }} {{- end }} - mkfs {{ not (empty $fs.type) | ternary (print "--type=" $fs.type) "" }} {{ not (empty $fs.label) | ternary (print "-L " $fs.label) "" }} {{ not (empty $fs.uuid) | ternary (print "-U " $fs.uuid) "" }} {{ default "" $fs.options }} {{ $forceFlag }} {{ $fs.device }} {{ default "" $fs.size }} || die "warewulf: mkfs: failed to format {{ $fs.device }}" + mkfs {{ not (empty $fs.type) | ternary (print "--type=" $fs.type) "" }} {{ not (empty $fs.label) | ternary (print "-L " $fs.label) "" }} {{ not (empty $fs.uuid) | ternary (print "-U " $fs.uuid) "" }} {{ default "" $fs.options }} {{ not (empty $forceFlag) | ternary (print $forceFlag) "" }} {{ $fs.device }} {{ default "" $fs.size }} || die "warewulf: mkfs: failed to format {{ $fs.device }}" else info "warewulf: mkfs: skipping {{ $fs.device }}" fi