Do not return error for efi.ReadLoadOption

When encountering a boot-entry for a device-path that go-efilib is unable to parse we should just skip that entry instead of erroring out. This same behavior is used earlier in the same loop so this should fix an edge-case where the boot entry is parseable but the device-path is not. Signed-off-by: Fredrik Lönnegren <[email protected]>
frelon · May 23, 2024 · 2e56a09 · 2e56a09
1 parent fa82c1b
commit 2e56a09
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/bootloader/grub.go b/pkg/bootloader/grub.go
@@ -339,7 +339,7 @@ func (g *Grub) clearEntry() error {
 // createBootEntry will create an entry in the efi vars for our shim and set it to boot first in the bootorder
 func (g *Grub) CreateEntry(shimName string, relativeTo string, efiVariables eleefi.Variables) error {
 	g.logger.Debugf("Creating boot entry for elemental pointing to shim %s/%s", constants.EntryEFIPath, shimName)
-	bm, err := eleefi.NewBootManagerForVariables(efiVariables)
+	bm, err := eleefi.NewBootManagerForVariables(g.logger, efiVariables)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/efi/manager.go b/pkg/efi/manager.go
@@ -15,14 +15,16 @@ import (
 
 	efi "github.com/canonical/go-efilib"
 	efilinux "github.com/canonical/go-efilib/linux"
+
+	"github.com/rancher/elemental-toolkit/v2/pkg/types"
 )
 
 const (
 	maxBootEntries = 65535 // Maximum number of boot entries we can hold
 )
 
 // NewBootManagerForVariables returns a boot manager for the given EFIVariables manager
-func NewBootManagerForVariables(efivars Variables) (BootManager, error) {
+func NewBootManagerForVariables(logger types.Logger, efivars Variables) (BootManager, error) {
 	var err error
 	bm := BootManager{}
 	bm.efivars = efivars
@@ -51,6 +53,7 @@ func NewBootManagerForVariables(efivars Variables) (BootManager, error) {
 	for _, name := range names {
 		var entry BootEntryVariable
 		if parsed, err := fmt.Sscanf(name, "Boot%04X", &entry.BootNumber); len(name) != 8 || parsed != 1 || err != nil {
+			logger.Warnf("Failed reading efi load option for '%s': %s", name, err.Error())
 			continue
 		}
 		entry.Data, entry.Attributes, err = bm.efivars.GetVariable(efi.GlobalVariable, name)
@@ -59,7 +62,8 @@ func NewBootManagerForVariables(efivars Variables) (BootManager, error) {
 		}
 		entry.LoadOption, err = efi.ReadLoadOption(bytes.NewReader(entry.Data))
 		if err != nil {
-			return bm, err
+			logger.Warnf("Error reading efi load option for '%s': %s", name, err.Error())
+			continue
 		}
 
 		bm.entries[entry.BootNumber] = entry