Merge pull request #567 from gibmat/include-secure-boot-efi-error

stgraber · web-flow · commit a20ee436598e · 2025-11-17T14:45:25.000-05:00
Include underlying error when we cannot read an EFI variable
diff --git a/incus-osd/internal/secureboot/efi_vars.go b/incus-osd/internal/secureboot/efi_vars.go
@@ -131,7 +131,7 @@ func UpdateSecureBootCerts(ctx context.Context, tarArchive string) (bool, error)
 func applySecureBootUpdates(ctx context.Context, varName string, newCerts map[string][]byte) (bool, error) {
 	existingCerts, err := GetCertificatesFromVar(varName)
 	if err != nil {
-		return false, fmt.Errorf("failed to read EFI variable '%s'", varName)
+		return false, fmt.Errorf("failed to read EFI variable %q: %w", varName, err)
 	}
 
 	for certFingerprint, certContents := range newCerts {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func UpdateSecureBootCerts(ctx context.Context, tarArchive string) (bool, error)`
`131`	`131`	`func applySecureBootUpdates(ctx context.Context, varName string, newCerts map[string][]byte) (bool, error) {`
`132`	`132`	`existingCerts, err := GetCertificatesFromVar(varName)`
`133`	`133`	`if err != nil {`
`134`		`- return false, fmt.Errorf("failed to read EFI variable '%s'", varName)`
	`134`	`+ return false, fmt.Errorf("failed to read EFI variable %q: %w", varName, err)`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`for certFingerprint, certContents := range newCerts {`