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

Fix sfdisk overlay for fresh disks by forcing GPT label

Browse Source 
Fixes #2025
This commit is contained in:
kosmolito
2025-09-28 09:50:13 +00:00
committed by Jonathon Anderson
parent a16d92f56e
commit 1c11eaff09
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

@@ -33,7 +33,7 @@ else :
{{- range $i, $device := $disks }}
{{- if $device.device }}
info "warewulf: sfdisk: partitioning {{ $device.device }}"
sfdisk --wipe "{{ default "auto" $device.wipe }}" "{{ $device.device }}" < "${PREFIX}/warewulf/sfdisk/device-{{ $i }}" || die "warewulf: sfdisk: failed to partition {{ $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 }}"
if command -v blockdev >/dev/null ; then
info "warewulf: blockdev: re-reading partition table"