From c8f49a432e2e41a138ede4deeda3b0588ecc6d68 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Tue, 10 Dec 2024 10:37:59 +0100 Subject: [PATCH] Fix boot selection on uki Seems like systemd-boot identifies entries by the ID whcih doesnt show anywhere, and that Id is the entry conf name minus the boot assesment Signed-off-by: Itxaka --- pkg/action/bootentries.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/action/bootentries.go b/pkg/action/bootentries.go index 0a8bc24..68963c6 100644 --- a/pkg/action/bootentries.go +++ b/pkg/action/bootentries.go @@ -133,13 +133,9 @@ func selectBootEntrySystemd(cfg *config.Config, entry string) error { if err != nil { return err } - assessment, err := utils.ReadAssessmentFromEntry(cfg.Fs, bootFileName, cfg.Logger) - if err != nil { - cfg.Logger.Logger.Err(err).Str("entry", entry).Str("boot file name", bootFileName).Msg("could not read assessment from entry") - return err - } - bootName := fmt.Sprintf("%s%s.conf", bootFileName, assessment) + bootName := fmt.Sprintf("%s.conf", bootFileName) // Set the default entry to the selected entry + // This is the file name of the entry to be set as default, boot assesment doesnt seem to count as it uses the ID which is the config name systemdConf["default"] = bootName err = utils.SystemdBootConfWriter(cfg.Fs, filepath.Join(efiPartition.MountPoint, "loader/loader.conf"), systemdConf) if err != nil {