Skip to content

Commit bf160da

Browse files
committed
Merge remote-tracking branch 'origin/pull/269'
* origin/pull/269: Ignore Setup mode and immutable variables for export
2 parents d3e9315 + 7a3d56b commit bf160da

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmd/sbctl/enroll-keys.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func KeySync(guid util.EFIGUID, keydir string, oems []string) error {
272272

273273
func RunEnrollKeys(cmd *cobra.Command, args []string) error {
274274
// SetupMode is not necessarily required on a partial enrollment
275-
if !efi.GetSetupMode() && enrollKeysCmdOptions.Partial.Value == "" {
275+
if !efi.GetSetupMode() && enrollKeysCmdOptions.Partial.Value == "" && enrollKeysCmdOptions.Export.Value == "" {
276276
return ErrSetupModeDisabled
277277
}
278278

@@ -309,7 +309,7 @@ func RunEnrollKeys(cmd *cobra.Command, args []string) error {
309309
if len(enrollKeysCmdOptions.BuiltinFirmwareCerts) >= 1 {
310310
oems = append(oems, "firmware-builtin")
311311
}
312-
if !enrollKeysCmdOptions.IgnoreImmutable {
312+
if !enrollKeysCmdOptions.IgnoreImmutable && enrollKeysCmdOptions.Export.Value == "" {
313313
if err := sbctl.CheckImmutable(); err != nil {
314314
return err
315315
}

0 commit comments

Comments
 (0)