particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel90beta: ensure grub default is not set

Browse source 
A future change to `NewGrub2StageOptions` will result in a change of
`Config.Default` to `saved` if a kernel is set. Preserve the current
behavior by manually resetting it to the empty string.
This commit is contained in:
Christian Kellner 2022-03-09 19:45:09 +01:00 • committed by Ondřej Budai
parent 111cd8871f
commit 96411158e6
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/distro/rhel90beta/pipelines.go
View file

@ -1087,7 +1087,15 @@ func bootloaderConfigStage(t *imageType, partitionTable *disk.PartitionTable, ke
kernelOptions := t.kernelOptions
uefi := t.supportsUEFI()
legacy := t.arch.legacy
return osbuild.NewGRUB2Stage(osbuild.NewGrub2StageOptions(partitionTable, kernelOptions, kernel, kernelVer, uefi, legacy, "redhat", false))
options := osbuild.NewGrub2StageOptions(partitionTable, kernelOptions, kernel, kernelVer, uefi, legacy, "redhat", false)
// `NewGrub2StageOptions` now might set this to "saved"; but when 9.0 beta was released
// it was not available. To keep manifests from changing we need to reset it here.
if options.Config != nil {
options.Config.Default = ""
}
return osbuild.NewGRUB2Stage(options)
}
func bootloaderInstStage(filename string, pt *disk.PartitionTable, arch *architecture, kernelVer string, devices *osbuild.Devices, mounts *osbuild.Mounts, disk *osbuild.Device) *osbuild.Stage {