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

Make mkfs -f/-F flag selection more explicit

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-12-17 15:11:09 -07:00
parent c674728c09
commit 8bf2e115a9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -37,7 +37,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed ### Removed
- Remove unused Netdev `Prefix` field. - Remove unused Netdev `Prefix` field.
- Fixed mkfs overlay overwrite/force-flag behavior. #2028.
### Fixed ### 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 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 warewulf-dracut to not run the wwinit module if root is not set to `root=wwclient*`
- Fix `wwctl image import --update` #2066 - Fix `wwctl image import --update` #2066
- Fix filesystem overwrite/force behavior in mkfs overlay. #2028
### Dependencies ### Dependencies

4
overlays/mkfs/rootfs/warewulf/wwinit.d/20-mkfs.sh.ww
View File

@@ -59,9 +59,9 @@ if command -v mkfs >/dev/null ; then :
info "warewulf: mkfs: formatting {{ $fs.device }}" info "warewulf: mkfs: formatting {{ $fs.device }}"
{{- $forceFlag := "" }} {{- $forceFlag := "" }}
{{- if $fs.overwrite }} {{- if $fs.overwrite }}
{{- if eq $fs.type "ext4" }} {{- if regexMatch "^ext[234]$" $fs.type }}
{{- $forceFlag = "-F" }} {{- $forceFlag = "-F" }}
{{- else }} {{- else if regexMatch "^(xfs|btrfs)$" $fs.type }}
{{- $forceFlag = "-f" }} {{- $forceFlag = "-f" }}
{{- end }} {{- end }}
{{- end }} {{- end }}