refactor: move BootloaderKind into machinery

smira · smira · commit 7033275a7a22 · 2026-01-15T20:21:11.000+04:00
This type is used in Image Factory schematic, so move it into machinery
so that it can be imported into IF without pulling Talos core.

Signed-off-by: Andrey Smirnov &lt;andrey.smirnov@siderolabs.com&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -423,6 +423,7 @@ COPY --from=go-generate /src/pkg/imager/profile/ /pkg/imager/profile/
 COPY --from=go-generate /src/pkg/machinery/resources/ /pkg/machinery/resources/
 COPY --from=go-generate /src/pkg/machinery/config/schemas/ /pkg/machinery/config/schemas/
 COPY --from=go-generate /src/pkg/machinery/config/types/ /pkg/machinery/config/types/
+COPY --from=go-generate /src/pkg/machinery/imager/imageropts/ /pkg/machinery/imager/imageropts/
 COPY --from=go-generate /src/pkg/machinery/nethelpers/ /pkg/machinery/nethelpers/
 COPY --from=go-generate /src/pkg/machinery/extensions/ /pkg/machinery/extensions/
 COPY --from=go-generate /src/pkg/machinery/version/os-release /pkg/machinery/version/os-release
diff --git a/pkg/imager/profile/output.go b/pkg/imager/profile/output.go
@@ -5,6 +5,7 @@
 package profile
 
 import (
+	"github.com/siderolabs/talos/pkg/machinery/imager/imageropts"
 	"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
 )
 
@@ -109,18 +110,14 @@ const (
 )
 
 // BootloaderKind is a bootloader for the disk image.
-type BootloaderKind int
+type BootloaderKind = imageropts.BootloaderKind
 
+// BootloaderKind values re-exported from imageropts.
 const (
-	// BootLoaderKindNone is the zero value.
-	BootLoaderKindNone BootloaderKind = iota // none
-	// BootLoaderKindDualBoot is the dual-boot bootloader.
-	// using sd-boot for UEFI and GRUB for BIOS.
-	BootLoaderKindDualBoot // dual-boot
-	// BootLoaderKindSDBoot is the sd-boot bootloader.
-	BootLoaderKindSDBoot // sd-boot
-	// BootLoaderKindGrub is the GRUB bootloader.
-	BootLoaderKindGrub // grub
+	BootLoaderKindNone     = imageropts.BootLoaderKindNone
+	BootLoaderKindDualBoot = imageropts.BootLoaderKindDualBoot
+	BootLoaderKindSDBoot   = imageropts.BootLoaderKindSDBoot
+	BootLoaderKindGrub     = imageropts.BootLoaderKindGrub
 )
 
 // FillDefaults fills default values for the output.
diff --git a/pkg/imager/profile/outputkind_enumer.go b/pkg/imager/profile/outputkind_enumer.go
diff --git a/pkg/imager/profile/profile.go b/pkg/imager/profile/profile.go
@@ -19,7 +19,7 @@ import (
 
 //go:generate go tool github.com/siderolabs/deep-copy -type Profile -type SecureBootAssets -header-file ../../../hack/boilerplate.txt -o deep_copy.generated.go .
 
-//go:generate go tool github.com/dmarkham/enumer -type OutputKind,OutFormat,DiskFormat,SDBootEnrollKeys,BootloaderKind -linecomment -text
+//go:generate go tool github.com/dmarkham/enumer -type OutputKind,OutFormat,DiskFormat,SDBootEnrollKeys -linecomment -text
 
 // Profile describes image generation result.
 type Profile struct {
diff --git a/pkg/machinery/imager/imageropts/bootloaderkind_enumer.go b/pkg/machinery/imager/imageropts/bootloaderkind_enumer.go
diff --git a/pkg/machinery/imager/imageropts/imageropts.go b/pkg/machinery/imager/imageropts/imageropts.go
@@ -0,0 +1,23 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+// Package imageropts contains exportable types used in imager profile options.
+package imageropts
+
+//go:generate go tool github.com/dmarkham/enumer -type BootloaderKind -linecomment -text
+
+// BootloaderKind is a bootloader for the disk image.
+type BootloaderKind int
+
+const (
+	// BootLoaderKindNone is the zero value.
+	BootLoaderKindNone BootloaderKind = iota // none
+	// BootLoaderKindDualBoot is the dual-boot bootloader.
+	// using sd-boot for UEFI and GRUB for BIOS.
+	BootLoaderKindDualBoot // dual-boot
+	// BootLoaderKindSDBoot is the sd-boot bootloader.
+	BootLoaderKindSDBoot // sd-boot
+	// BootLoaderKindGrub is the GRUB bootloader.
+	BootLoaderKindGrub // grub
+)
