distro/rhel85: ensure grub default is not set

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:44:27 +01:00 committed by Ondřej Budai
parent fa8f01543d
commit 111cd8871f

View file

@ -1277,6 +1277,12 @@ func bootloaderConfigStage(t *imageType, partitionTable *disk.PartitionTable, ke
options := osbuild.NewGrub2StageOptions(partitionTable, kernelOptions, kernel, kernelVer, uefi, legacy, "redhat", install)
options.Greenboot = greenboot
// `NewGrub2StageOptions` now might set this to "saved"; but when 8.5 was released
// it was not available. To keep manifests from changing we need to reset it here.
if options.Config != nil {
options.Config.Default = ""
}
// before unifying the org.osbuild.grub2 stage option generator, we didn't
// set the following for RHEL 8.5, so we need to revert here to maintain
// the old behaviour