Only be verbose the first time secure_mode() is called.

It's annoying to find out we're not in SB mode over and over.  Really it
is.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2015-06-29 14:41:21 -04:00
parent fef725de4d
commit c55b17d281

8
shim.c
View File

@ -613,12 +613,14 @@ static EFI_STATUS check_whitelist (WIN_CERTIFICATE_EFI_PKCS *cert,
static BOOLEAN secure_mode (void) static BOOLEAN secure_mode (void)
{ {
static int first = 1;
if (user_insecure_mode) if (user_insecure_mode)
return FALSE; return FALSE;
if (variable_is_secureboot() != 1) { if (variable_is_secureboot() != 1) {
if (verbose && !in_protocol) if (verbose && !in_protocol && first)
console_notify(L"Secure boot not enabled"); console_notify(L"Secure boot not enabled");
first = 0;
return FALSE; return FALSE;
} }
@ -629,11 +631,13 @@ static BOOLEAN secure_mode (void)
* to consider it. * to consider it.
*/ */
if (variable_is_setupmode(0) == 1) { if (variable_is_setupmode(0) == 1) {
if (verbose && !in_protocol) if (verbose && !in_protocol && first)
console_notify(L"Platform is in setup mode"); console_notify(L"Platform is in setup mode");
first = 0;
return FALSE; return FALSE;
} }
first = 0;
return TRUE; return TRUE;
} }