coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-18 14:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

grub: avoid printing empty error messages

Browse Source 
this replaces the previous behaviour, which erred
on a specific value of grub_errno, which was a
problem if other types of errors used that value.

due to the way i patch out the prefix error messages,
this new patch ensures that only those errors are
silenced. all other messages will be printed.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-11-05 21:59:52 +00:00
parent 6e60bfe0b0
commit 80b70d899c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/grub/patches/0004-prefix/0003-don-t-print-errors-if-GRUB_ERR_FILE_NOT_FOUND.patch → config/grub/patches/0004-prefix/0003-don-t-print-empty-error-messages.patch
+4 -4
View File
@@ -1,7 +1,7 @@
From f80b344cd3ebd098ba6e63aa1ee97a6223ffe7f0 Mon Sep 17 00:00:00 2001 From e5b7ec81421487e71bcaf8b6b5a27f3649a62753 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org> From: Leah Rowe <leah@libreboot.org>
Date: Sun, 5 Nov 2023 17:25:20 +0000 Date: Sun, 5 Nov 2023 17:25:20 +0000
Subject: [PATCH 1/1] don't print errors if GRUB_ERR_FILE_NOT_FOUND Subject: [PATCH 1/1] don't print empty error messages
this is part two of the quest to kill the prefix this is part two of the quest to kill the prefix
error message. after i disabled prefix-related error message. after i disabled prefix-related
@@ -13,7 +13,7 @@ Signed-off-by: Leah Rowe <leah@libreboot.org>
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
index 53c734de7..c9488b748 100644 index 53c734de7..7cac53983 100644
--- a/grub-core/kern/err.c --- a/grub-core/kern/err.c
+++ b/grub-core/kern/err.c +++ b/grub-core/kern/err.c
@@ -107,7 +107,8 @@ grub_print_error (void) @@ -107,7 +107,8 @@ grub_print_error (void)
@@ -21,7 +21,7 @@ index 53c734de7..c9488b748 100644
if (grub_errno != GRUB_ERR_NONE) if (grub_errno != GRUB_ERR_NONE)
{ {
- grub_err_printf (_("error: %s.\n"), grub_errmsg); - grub_err_printf (_("error: %s.\n"), grub_errmsg);
+ if (grub_errno != GRUB_ERR_FILE_NOT_FOUND) + if (grub_strlen(grub_errmsg) > 0)
+ grub_err_printf (_("error: %s.\n"), grub_errmsg); + grub_err_printf (_("error: %s.\n"), grub_errmsg);
grub_err_printed_errors++; grub_err_printed_errors++;
} }