Skip to content

Commit 7c3be44

Browse files
committed
fixup! WIP: add reprovision
1 parent 44bcabf commit 7c3be44

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

overlord/devicestate/devicemgr.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2824,8 +2824,7 @@ func (m *DeviceManager) currentSystemAndGadgetAndEncryptionInfoWithAction(
28242824
}
28252825

28262826
if checkAction == nil {
2827-
const postInstall = true
2828-
checkContext, errorDetails, checkErr = secboot.PreinstallCheck(context.Background(), postInstall, bootChain)
2827+
checkContext, errorDetails, checkErr = secboot.PostinstallCheck(context.Background(), bootChain)
28292828
} else {
28302829
checkContext = data.checkContext
28312830
if checkContext == nil {

overlord/install/install.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,7 @@ func encryptionAvailabilityCheck(
405405
preinstallErrorDetails, err = secbootPreinstallCheckAction(checkContext, ctx, checkAction)
406406
newCheckContext = checkContext
407407
} else {
408-
const postInstall bool = false
409-
newCheckContext, preinstallErrorDetails, err = secbootPreinstallCheck(ctx, postInstall, images)
408+
newCheckContext, preinstallErrorDetails, err = secbootPreinstallCheck(ctx, images)
410409
}
411410

412411
if err != nil {

secboot/preinstall_sb_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,7 @@ func (s *preinstallSuite) testPreinstallCheckConfig(c *C, isVM, permitVM bool) {
283283
})
284284
s.AddCleanup(restore)
285285

286-
const postInstall = false
287-
checkContext, errorDetails, err := secboot.PreinstallCheck(context.Background(), postInstall, nil)
286+
checkContext, errorDetails, err := secboot.PreinstallCheck(context.Background(), nil)
288287
c.Assert(checkContext, NotNil)
289288
c.Assert(err, IsNil)
290289
c.Assert(errorDetails, IsNil)

0 commit comments

Comments
 (0)