feat: implement GPT editing

Lots of ideas from v1, coupled with new data structures and simplified ideas plus proper testing. Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Jul 24, 2024 · cfdeb03 · cfdeb03
1 parent 9d8d8e7
commit cfdeb03
Show file tree

Hide file tree

Showing 44 changed files with 1,527 additions and 211 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,8 +1,9 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-05-06T05:59:06Z by kres d15226e.
+# Generated on 2024-07-17T17:13:05Z by kres ac94478-dirty.
 
 *
+!internal
 !blkid
 !block
 !go.mod

diff --git a/.kres.yaml b/.kres.yaml
@@ -34,6 +34,8 @@ spec:
 kind: custom.Step
 name: zfs-img
 spec:
+  makefile:
+    enabled: true
   docker:
     enabled: true
     stages:

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-07-15T11:59:50Z by kres ac94478.
+# Generated on 2024-07-17T17:17:17Z by kres ac94478-dirty.
 
 ARG TOOLCHAIN
 
@@ -56,6 +56,7 @@ COPY go.sum go.sum
 RUN cd .
 RUN --mount=type=cache,target=/go/pkg go mod download
 RUN --mount=type=cache,target=/go/pkg go mod verify
+COPY ./internal ./internal
 COPY ./blkid ./blkid
 COPY ./block ./block
 RUN --mount=type=cache,target=/go/pkg go list -mod=readonly all >/dev/null

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-07-15T11:59:50Z by kres ac94478.
+# Generated on 2024-07-17T17:17:17Z by kres ac94478-dirty.
 
 # common variables
 
@@ -175,6 +175,8 @@ unit-tests:  ## Performs unit tests
 unit-tests-race:  ## Performs unit tests with race detection enabled.
 	@$(MAKE) target-$@  TARGET_ARGS="--allow security.insecure"
 
+zfs-img:
+
 .PHONY: lint
 lint: lint-golangci-lint lint-gofumpt lint-govulncheck  ## Run all linters for the project.
 

diff --git a/blkid/internal/filesystems/ext/ext.go b/blkid/internal/filesystems/ext/ext.go
@@ -5,7 +5,7 @@
 // Package ext probes extfs filesystems.
 package ext
 
-//go:generate go run ../../cstruct/cstruct.go -pkg ext -struct SuperBlock -input superblock.h -endianness LittleEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg ext -struct SuperBlock -input superblock.h -endianness LittleEndian
 
 import (
 	"bytes"
@@ -16,6 +16,7 @@ import (
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 const sbOffset = 0x400
@@ -49,7 +50,7 @@ func (p *Probe) Name() string {
 func (p *Probe) Probe(r probe.Reader, _ magic.Magic) (*probe.Result, error) {
 	buf := make([]byte, SUPERBLOCK_SIZE)
 
-	if err := utils.ReadFullAt(r, buf, sbOffset); err != nil {
+	if err := ioutil.ReadFullAt(r, buf, sbOffset); err != nil {
 		return nil, err
 	}
 

diff --git a/blkid/internal/filesystems/iso9660/iso9660.go b/blkid/internal/filesystems/iso9660/iso9660.go
@@ -5,7 +5,7 @@
 // Package iso9660 probes ISO9660 filesystems.
 package iso9660
 
-//go:generate go run ../../cstruct/cstruct.go -pkg iso9660 -struct VolumeDescriptor -input volume.h -endianness NativeEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg iso9660 -struct VolumeDescriptor -input volume.h -endianness NativeEndian
 
 import (
 	"strings"
@@ -15,7 +15,7 @@ import (
 
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
-	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 const (
@@ -62,7 +62,7 @@ vdLoop:
 	for i := range vdMax {
 		buf := make([]byte, VOLUMEDESCRIPTOR_SIZE)
 
-		if err := utils.ReadFullAt(r, buf, superblockOffset+sectorSize*int64(i)); err != nil {
+		if err := ioutil.ReadFullAt(r, buf, superblockOffset+sectorSize*int64(i)); err != nil {
 			break
 		}
 

diff --git a/blkid/internal/filesystems/luks/luks.go b/blkid/internal/filesystems/luks/luks.go
@@ -5,7 +5,7 @@
 // Package luks probes LUKS encrypted filesystems.
 package luks
 
-//go:generate go run ../../cstruct/cstruct.go -pkg luks -struct Luks2Header -input luks2_header.h -endianness BigEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg luks -struct Luks2Header -input luks2_header.h -endianness BigEndian
 
 import (
 	"bytes"
@@ -15,7 +15,7 @@ import (
 
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
-	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 var luksMagic = magic.Magic{
@@ -40,7 +40,7 @@ func (p *Probe) Name() string {
 func (p *Probe) Probe(r probe.Reader, _ magic.Magic) (*probe.Result, error) {
 	buf := make([]byte, LUKS2HEADER_SIZE)
 
-	if err := utils.ReadFullAt(r, buf, 0); err != nil {
+	if err := ioutil.ReadFullAt(r, buf, 0); err != nil {
 		return nil, err
 	}
 

diff --git a/blkid/internal/filesystems/lvm2/lvm2.go b/blkid/internal/filesystems/lvm2/lvm2.go
@@ -5,12 +5,12 @@
 // Package lvm2 probes LVM2 PVs.
 package lvm2
 
-//go:generate go run ../../cstruct/cstruct.go -pkg lvm2 -struct LVM2Header -input lvm2_header.h -endianness LittleEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg lvm2 -struct LVM2Header -input lvm2_header.h -endianness LittleEndian
 
 import (
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
-	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 var (
@@ -44,7 +44,7 @@ func (p *Probe) Name() string {
 func (p *Probe) probe(r probe.Reader, offset int64) (LVM2Header, error) {
 	buf := make([]byte, LVM2HEADER_SIZE)
 
-	if err := utils.ReadFullAt(r, buf, offset); err != nil {
+	if err := ioutil.ReadFullAt(r, buf, offset); err != nil {
 		return nil, err
 	}
 

diff --git a/blkid/internal/filesystems/squashfs/squashfs.go b/blkid/internal/filesystems/squashfs/squashfs.go
@@ -5,12 +5,12 @@
 // Package squashfs probes Squash filesystems.
 package squashfs
 
-//go:generate go run ../../cstruct/cstruct.go -pkg squashfs -struct SuperBlock -input superblock.h -endianness LittleEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg squashfs -struct SuperBlock -input superblock.h -endianness LittleEndian
 
 import (
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
-	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 var squashfsMagic1 = magic.Magic{ // big endian
@@ -43,7 +43,7 @@ func (p *Probe) Name() string {
 func (p *Probe) Probe(r probe.Reader, _ magic.Magic) (*probe.Result, error) {
 	buf := make([]byte, SUPERBLOCK_SIZE)
 
-	if err := utils.ReadFullAt(r, buf, 0); err != nil {
+	if err := ioutil.ReadFullAt(r, buf, 0); err != nil {
 		return nil, err
 	}
 

diff --git a/blkid/internal/filesystems/swap/swap.go b/blkid/internal/filesystems/swap/swap.go
@@ -6,7 +6,7 @@
 package swap
 
 // TODO: is it little or host endian?
-//go:generate go run ../../cstruct/cstruct.go -pkg swap -struct SwapHeader -input swap_header.h -endianness LittleEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg swap -struct SwapHeader -input swap_header.h -endianness LittleEndian
 
 import (
 	"bytes"
@@ -16,7 +16,7 @@ import (
 
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
-	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 var (
@@ -99,7 +99,7 @@ func (p *Probe) Name() string {
 func (p *Probe) Probe(r probe.Reader, m magic.Magic) (*probe.Result, error) {
 	buf := make([]byte, SWAPHEADER_SIZE)
 
-	if err := utils.ReadFullAt(r, buf, 1024); err != nil {
+	if err := ioutil.ReadFullAt(r, buf, 1024); err != nil {
 		return nil, err
 	}
 

diff --git a/blkid/internal/filesystems/talosmeta/talosmeta.go b/blkid/internal/filesystems/talosmeta/talosmeta.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
-	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 // META constants, from talos/internal/pkg/meta/internal/adv/talos.
@@ -45,15 +45,15 @@ func (p *Probe) Probe(r probe.Reader, _ magic.Magic) (*probe.Result, error) {
 	buf := make([]byte, 4)
 
 	for _, offset := range []int64{0, length} {
-		if err := utils.ReadFullAt(r, buf, offset); err != nil {
+		if err := ioutil.ReadFullAt(r, buf, offset); err != nil {
 			return nil, err
 		}
 
 		if binary.BigEndian.Uint32(buf) != magic1 {
 			continue
 		}
 
-		if err := utils.ReadFullAt(r, buf, offset+length-4); err != nil {
+		if err := ioutil.ReadFullAt(r, buf, offset+length-4); err != nil {
 			return nil, err
 		}
 

diff --git a/blkid/internal/filesystems/vfat/vfat.go b/blkid/internal/filesystems/vfat/vfat.go
@@ -5,14 +5,15 @@
 // Package vfat probes FAT12/FAT16/FAT32 filesystems.
 package vfat
 
-//go:generate go run ../../cstruct/cstruct.go -pkg vfat -struct MSDOSSB -input msdos.h -endianness LittleEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg vfat -struct MSDOSSB -input msdos.h -endianness LittleEndian
 
-//go:generate go run ../../cstruct/cstruct.go -pkg vfat -struct VFATSB -input vfat.h -endianness LittleEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg vfat -struct VFATSB -input vfat.h -endianness LittleEndian
 
 import (
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 var (
@@ -72,11 +73,11 @@ func (p *Probe) Probe(r probe.Reader, _ magic.Magic) (*probe.Result, error) {
 	vfatBuf := make([]byte, VFATSB_SIZE)
 	msdosBuf := make([]byte, MSDOSSB_SIZE)
 
-	if err := utils.ReadFullAt(r, vfatBuf, 0); err != nil {
+	if err := ioutil.ReadFullAt(r, vfatBuf, 0); err != nil {
 		return nil, err
 	}
 
-	if err := utils.ReadFullAt(r, msdosBuf, 0); err != nil {
+	if err := ioutil.ReadFullAt(r, msdosBuf, 0); err != nil {
 		return nil, err
 	}
 

diff --git a/blkid/internal/filesystems/xfs/xfs.go b/blkid/internal/filesystems/xfs/xfs.go
@@ -5,7 +5,7 @@
 // Package xfs probes XFS filesystems.
 package xfs
 
-//go:generate go run ../../cstruct/cstruct.go -pkg xfs -struct SuperBlock -input superblock.h -endianness BigEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg xfs -struct SuperBlock -input superblock.h -endianness BigEndian
 
 import (
 	"bytes"
@@ -16,7 +16,7 @@ import (
 
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
-	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 var xfsMagic = magic.Magic{
@@ -41,7 +41,7 @@ func (p *Probe) Name() string {
 func (p *Probe) Probe(r probe.Reader, _ magic.Magic) (*probe.Result, error) {
 	buf := make([]byte, SUPERBLOCK_SIZE)
 
-	if err := utils.ReadFullAt(r, buf, 0); err != nil {
+	if err := ioutil.ReadFullAt(r, buf, 0); err != nil {
 		return nil, err
 	}
 

diff --git a/blkid/internal/filesystems/zfs/zfs.go b/blkid/internal/filesystems/zfs/zfs.go
@@ -5,14 +5,14 @@
 // Package zfs probes ZFS filesystems.
 package zfs
 
-//go:generate go run ../../cstruct/cstruct.go -pkg zfs -struct ZFSUB -input zfs.h -endianness LittleEndian
+//go:generate go run ../../../../internal/cstruct/cstruct.go -pkg zfs -struct ZFSUB -input zfs.h -endianness LittleEndian
 
 import (
 	"fmt"
 
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/magic"
 	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/probe"
-	"github.com/siderolabs/go-blockdevice/v2/blkid/internal/utils"
+	"github.com/siderolabs/go-blockdevice/v2/internal/ioutil"
 )
 
 // https://github.com/util-linux/util-linux/blob/c0207d354ee47fb56acfa64b03b5b559bb301280/libblkid/src/superblocks/zfs.c
@@ -66,7 +66,7 @@ func (p *Probe) Probe(r probe.Reader, _ magic.Magic) (*probe.Result, error) {
 		size - zfsStartOffset - lastLabelOffset,
 	} {
 		labelBuf := make([]byte, zfsVdevLabelSize)
-		if err := utils.ReadFullAt(r, labelBuf, int64(labelOffset)); err != nil {
+		if err := ioutil.ReadFullAt(r, labelBuf, int64(labelOffset)); err != nil {
 			return nil, err
 		}