From 10d0cfd93a083fb8b71b7c0297df52feb55e044b Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Thu, 25 Dec 2025 14:18:23 +0530 Subject: [PATCH] fix: overlay install in image mode Since bootloader interface got refactored to support rootless `ExtraInstallStep` needs to be handled in `GenerateAssets`. Signed-off-by: Noel Georgi --- .../machined/pkg/runtime/v1alpha1/bootloader/grub/grub.go | 6 ++++++ .../pkg/runtime/v1alpha1/bootloader/grub/install.go | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/grub.go b/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/grub.go index bd7aff84c..0cc398ed2 100644 --- a/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/grub.go +++ b/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/grub.go @@ -137,6 +137,12 @@ func (c *Config) GenerateAssets(efiAssetsPath string, opts options.InstallOption }) } + if opts.ExtraInstallStep != nil { + if err := opts.ExtraInstallStep(); err != nil { + return nil, err + } + } + return partitionOptions, nil } diff --git a/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/install.go b/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/install.go index 27d9514a5..73da2e157 100644 --- a/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/install.go +++ b/internal/app/machined/pkg/runtime/v1alpha1/bootloader/grub/install.go @@ -78,12 +78,6 @@ func (c *Config) Install(opts options.InstallOptions) (*options.InstallResult, e return err } - if opts.ExtraInstallStep != nil { - if err := opts.ExtraInstallStep(); err != nil { - return err - } - } - return nil }, []blkid.ProbeOption{