Skip to content

Commit 3dd1f4e

Browse files
committed
chore: extract pkg/imager/quirks to pkg/machinery
To make it possible to use it without pulling the whole Talos. Signed-off-by: Artem Chernyshev <artem.chernyshev@talos-systems.com>
1 parent 78bc3a4 commit 3dd1f4e

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

cmd/installer/pkg/install/manifest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/board"
2323
"github.com/siderolabs/talos/internal/pkg/mount"
2424
"github.com/siderolabs/talos/internal/pkg/partition"
25-
"github.com/siderolabs/talos/pkg/imager/quirks"
2625
"github.com/siderolabs/talos/pkg/machinery/constants"
26+
"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
2727
)
2828

2929
// Manifest represents the instructions for preparing all block devices

internal/app/machined/pkg/runtime/v1alpha1/bootloader/bootloader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub"
1313
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/options"
1414
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/sdboot"
15-
"github.com/siderolabs/talos/pkg/imager/quirks"
15+
"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
1616
)
1717

1818
// Bootloader describes a bootloader.

pkg/imager/imager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"github.com/siderolabs/talos/pkg/imager/extensions"
2525
"github.com/siderolabs/talos/pkg/imager/overlay/executor"
2626
"github.com/siderolabs/talos/pkg/imager/profile"
27-
"github.com/siderolabs/talos/pkg/imager/quirks"
2827
"github.com/siderolabs/talos/pkg/imager/utils"
2928
"github.com/siderolabs/talos/pkg/machinery/config/merge"
3029
"github.com/siderolabs/talos/pkg/machinery/constants"
30+
"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
3131
"github.com/siderolabs/talos/pkg/machinery/kernel"
3232
"github.com/siderolabs/talos/pkg/machinery/overlay"
3333
"github.com/siderolabs/talos/pkg/machinery/version"

pkg/imager/iso/grub.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/siderolabs/go-cmd/pkg/cmd"
1717

1818
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub"
19-
"github.com/siderolabs/talos/pkg/imager/quirks"
2019
"github.com/siderolabs/talos/pkg/imager/utils"
20+
"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
2121
)
2222

2323
// GRUBOptions described the input for the CreateGRUB function.

pkg/imager/out.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"github.com/siderolabs/talos/pkg/imager/ova"
3434
"github.com/siderolabs/talos/pkg/imager/profile"
3535
"github.com/siderolabs/talos/pkg/imager/qemuimg"
36-
"github.com/siderolabs/talos/pkg/imager/quirks"
3736
"github.com/siderolabs/talos/pkg/imager/utils"
3837
"github.com/siderolabs/talos/pkg/machinery/constants"
38+
"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
3939
"github.com/siderolabs/talos/pkg/reporter"
4040
)
4141

pkg/imager/profile/input.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"github.com/siderolabs/talos/pkg/imager/profile/internal/signer/aws"
2727
"github.com/siderolabs/talos/pkg/imager/profile/internal/signer/azure"
2828
"github.com/siderolabs/talos/pkg/imager/profile/internal/signer/file"
29-
"github.com/siderolabs/talos/pkg/imager/quirks"
3029
"github.com/siderolabs/talos/pkg/images"
3130
"github.com/siderolabs/talos/pkg/machinery/constants"
31+
"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
3232
)
3333

3434
const (
File renamed without changes.

pkg/imager/quirks/quirks_test.go renamed to pkg/machinery/imager/quirks/quirks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/stretchr/testify/assert"
1111

12-
"github.com/siderolabs/talos/pkg/imager/quirks"
12+
"github.com/siderolabs/talos/pkg/machinery/imager/quirks"
1313
)
1414

1515
func TestSupportsResetOption(t *testing.T) {

0 commit comments

Comments
 (0)