fixup! overlord/devicestate,secboot: fix factory reset on older versions

canonical · Jan 27, 2025 · 91da819 · 91da819
1 parent 7c2e31f
commit 91da819
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/overlord/devicestate/handlers_install.go b/overlord/devicestate/handlers_install.go
@@ -1387,7 +1387,6 @@ func deleteOldSaveKey(saveMntPnt string) error {
 		"factory-reset-old-fallback": true,
 	}
 
-
 	if err := secbootDeleteKeys(diskPath, toDelete); err != nil {
 		return fmt.Errorf("cannot delete previous keys: %w", err)
 	}

diff --git a/secboot/secboot.go b/secboot/secboot.go
@@ -260,5 +260,5 @@ type NonAtomicOperationAllowedFlag struct {
 // they should be used with care and intentionally (that's why the
 // extra hoops).
 func AllowNonAtomicOperation() *NonAtomicOperationAllowedFlag {
-       return &NonAtomicOperationAllowedFlag{}
+	return &NonAtomicOperationAllowedFlag{}
 }
diff --git a/secboot/secboot_sb.go b/secboot/secboot_sb.go
@@ -44,14 +44,14 @@ func sbNewLUKS2KeyDataReaderImpl(device, slot string) (sb.KeyDataReader, error)
 }
 
 var (
-	sbActivateVolumeWithKey          = sb.ActivateVolumeWithKey
-	sbActivateVolumeWithKeyData      = sb.ActivateVolumeWithKeyData
-	sbActivateVolumeWithRecoveryKey  = sb.ActivateVolumeWithRecoveryKey
-	sbDeactivateVolume               = sb.DeactivateVolume
-	sbAddLUKS2ContainerUnlockKey     = sb.AddLUKS2ContainerUnlockKey
-	sbRenameLUKS2ContainerKey        = sb.RenameLUKS2ContainerKey
-	sbNewLUKS2KeyDataReader          = sbNewLUKS2KeyDataReaderImpl
-	sbSetProtectorKeys               = sb_plainkey.SetProtectorKeys
+	sbActivateVolumeWithKey         = sb.ActivateVolumeWithKey
+	sbActivateVolumeWithKeyData     = sb.ActivateVolumeWithKeyData
+	sbActivateVolumeWithRecoveryKey = sb.ActivateVolumeWithRecoveryKey
+	sbDeactivateVolume              = sb.DeactivateVolume
+	sbAddLUKS2ContainerUnlockKey    = sb.AddLUKS2ContainerUnlockKey
+	sbRenameLUKS2ContainerKey       = sb.RenameLUKS2ContainerKey
+	sbNewLUKS2KeyDataReader         = sbNewLUKS2KeyDataReaderImpl
+	sbSetProtectorKeys              = sb_plainkey.SetProtectorKeys
 )
 
 func init() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1387,7 +1387,6 @@ func deleteOldSaveKey(saveMntPnt string) error { @@
     		"factory-reset-old-fallback": true,
     	}
     	if err := secbootDeleteKeys(diskPath, toDelete); err != nil {
     		return fmt.Errorf("cannot delete previous keys: %w", err)
     	}
@@ Expand Down @@