05417e978e
SBAT revocation update support delivered in mokutil 0.6.0 as well as shim-15.6 invoke "mokutil --set-sbat-policy latest" during the post script installation stage. So upgrade the version to 0.6.0 to make sure shim-15.6 can be upgraded smoothly. On the other hand, there are 4 patches delivered after 0.6.0 release to fix some bugs, apply these patches as well. *e498f64 Fix leak of fd in mok_get_variable() *d978c18 Fix leak of list in delete_data_from_req_var() *04791c2 mokutil bugfix: del unused opt "-s" *82694cb Show usage instead of aborting on bad flags Git-commit: e498f6460ff5aea6a7cd61a33087d03e88a2f52a Git-commit: d978c18f61b877afaab45a82d260b525423b8248 Git-commit: 04791c29e198b18808bca519267e31c8d3786a08 Git-commit: 82694cb1ce3b29c3705c25ae4cea3d07fe57b558 Link: https://github.com/lcp/mokutil/ Signed-off-by: Chenxi Mao <chenxi.mao@suse.com>
34 lines
801 B
Diff
34 lines
801 B
Diff
From 82694cb1ce3b29c3705c25ae4cea3d07fe57b558 Mon Sep 17 00:00:00 2001
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
|
Date: Tue, 17 May 2022 11:23:28 -0400
|
|
Subject: [PATCH 1/5] Show usage instead of aborting on bad flags
|
|
|
|
Aborting here just confuses users and is sufficiently unexpected to
|
|
cause the filing of bugs.
|
|
|
|
Related: https://bugzilla.redhat.com/show_bug.cgi?id=2087066
|
|
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
---
|
|
src/mokutil.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/src/mokutil.c b/src/mokutil.c
|
|
index 5d725c9..e8228af 100644
|
|
--- a/src/mokutil.c
|
|
+++ b/src/mokutil.c
|
|
@@ -2087,10 +2087,9 @@ main (int argc, char *argv[])
|
|
goto out;
|
|
case 'h':
|
|
case '?':
|
|
+ default:
|
|
command |= HELP;
|
|
break;
|
|
- default:
|
|
- abort ();
|
|
}
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|