Skip to content

Commit d8a435f

Browse files
committed
fix: initialize boot assets with defaults early
The problem was that bootloaders were correctly picking up defaults for `installer` mode (vs. `imager` mode), but DTB and other SBC stuff wasn't properly initialized, so installing on SBC fails. Now all options are properly initialized with defaults early in the process. Fixes #8009 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent c6835de commit d8a435f

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

cmd/installer/pkg/install/install.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ func NewInstaller(ctx context.Context, cmdline *procfs.Cmdline, mode Mode, opts
151151
}
152152
}
153153

154+
i.options.BootAssets.FillDefaults(opts.Arch)
155+
154156
bootLoaderPresent := i.bootloader != nil
155157
if !bootLoaderPresent {
156158
if mode.IsImage() {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ func (c *Config) Install(options options.InstallOptions) error {
3131
return err
3232
}
3333

34-
options.BootAssets.FillDefaults(options.Arch)
35-
3634
if err := utils.CopyFiles(
3735
options.Printf,
3836
utils.SourceDestination(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ func (c *Config) Install(options options.InstallOptions) error {
165165
}
166166
}
167167

168-
options.BootAssets.FillDefaults(options.Arch)
169-
170168
if err := utils.CopyFiles(
171169
options.Printf,
172170
utils.SourceDestination(

0 commit comments

Comments
 (0)