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

Adjust sfdisk --label gpt to only apply when wiping the disk

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-12-17 10:54:10 -07:00
parent 1c11eaff09
commit b36b2e9674
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overlays/sfdisk/internal/sfdisk_test.go
View File

@@ -181,7 +181,7 @@ if ! command -v sfdisk >/dev/null ; then
info "warewulf: sfdisk not found, skipping partitioning" info "warewulf: sfdisk not found, skipping partitioning"
else : else :
info "warewulf: sfdisk: partitioning /dev/sda" info "warewulf: sfdisk: partitioning /dev/sda"
sfdisk --label gpt --wipe "auto" "/dev/sda" < "${PREFIX}/warewulf/sfdisk/device-0" || die "warewulf: sfdisk: failed to partition /dev/sda" sfdisk --wipe "auto" "/dev/sda" < "${PREFIX}/warewulf/sfdisk/device-0" || die "warewulf: sfdisk: failed to partition /dev/sda"
if command -v blockdev >/dev/null ; then if command -v blockdev >/dev/null ; then
info "warewulf: blockdev: re-reading partition table" info "warewulf: blockdev: re-reading partition table"
@@ -238,7 +238,7 @@ if ! command -v sfdisk >/dev/null ; then
info "warewulf: sfdisk not found, skipping partitioning" info "warewulf: sfdisk not found, skipping partitioning"
else : else :
info "warewulf: sfdisk: partitioning /dev/sda" info "warewulf: sfdisk: partitioning /dev/sda"
sfdisk --label gpt --wipe "auto" "/dev/sda" < "${PREFIX}/warewulf/sfdisk/device-0" || die "warewulf: sfdisk: failed to partition /dev/sda" sfdisk --wipe "auto" "/dev/sda" < "${PREFIX}/warewulf/sfdisk/device-0" || die "warewulf: sfdisk: failed to partition /dev/sda"
if command -v blockdev >/dev/null ; then if command -v blockdev >/dev/null ; then
info "warewulf: blockdev: re-reading partition table" info "warewulf: blockdev: re-reading partition table"

3
overlays/sfdisk/rootfs/warewulf/wwinit.d/10-sfdisk.sh.ww
View File

@@ -24,6 +24,7 @@ else :
{{- $diskDict := dict "device" $disk.Id }} {{- $diskDict := dict "device" $disk.Id }}
{{- if $disk.WipeTable }} {{- if $disk.WipeTable }}
{{- $_ := set $diskDict "wipe" "always" }} {{- $_ := set $diskDict "wipe" "always" }}
{{- $_ := set $diskDict "labelOption" "--label gpt" }}
{{- end }} {{- end }}
{{- $disks = append $disks $diskDict }} {{- $disks = append $disks $diskDict }}
{{- end }} {{- end }}
@@ -33,7 +34,7 @@ else :
{{- range $i, $device := $disks }} {{- range $i, $device := $disks }}
{{- if $device.device }} {{- if $device.device }}
info "warewulf: sfdisk: partitioning {{ $device.device }}" info "warewulf: sfdisk: partitioning {{ $device.device }}"
sfdisk --label gpt --wipe "{{ default "auto" $device.wipe }}" "{{ $device.device }}" < "${PREFIX}/warewulf/sfdisk/device-{{ $i }}" || die "warewulf: sfdisk: failed to partition {{ $device.device }}" sfdisk {{ default "" $device.labelOption }} --wipe "{{ default "auto" $device.wipe }}" "{{ $device.device }}" < "${PREFIX}/warewulf/sfdisk/device-{{ $i }}" || die "warewulf: sfdisk: failed to partition {{ $device.device }}"
if command -v blockdev >/dev/null ; then if command -v blockdev >/dev/null ; then
info "warewulf: blockdev: re-reading partition table" info "warewulf: blockdev: re-reading partition table"