From 7178818021a9434e97e904d23af3bdcf58ea96b8 Mon Sep 17 00:00:00 2001
From: Valentin David <valentin.david@canonical.com>
Date: Tue, 10 Sep 2024 17:22:50 +0200
Subject: [PATCH] fixup! many: update secboot and use new key format

---
 secboot/encrypt_sb.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/secboot/encrypt_sb.go b/secboot/encrypt_sb.go
index 28bda0beb75..a5c3c9a170a 100644
--- a/secboot/encrypt_sb.go
+++ b/secboot/encrypt_sb.go
@@ -115,6 +115,8 @@ func EnsureRecoveryKey(keyFile string, rkeyDevs []RecoveryKeyDevice) (keys.Recov
 		if err != nil {
 			return keys.RecoveryKey{}, fmt.Errorf("cannot find list keys for: %v", err)
 		}
+		// LUKS2 containers created with older snapd have no
+		// tokens, thus no named key slots.
 		hasOnlyLegacyKeys := len(slots) == 0
 		if hasOnlyLegacyKeys {
 			authzMethod := "keyring"