From 80b70d899c0fc5c8d4b5301f67527907e2a76947 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 5 Nov 2023 21:59:52 +0000 Subject: grub: avoid printing empty error messages 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 --- .../0003-don-t-print-empty-error-messages.patch | 31 ++++++++++++++++++++++ ...t-print-errors-if-GRUB_ERR_FILE_NOT_FOUND.patch | 31 ---------------------- 2 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 config/grub/patches/0004-prefix/0003-don-t-print-empty-error-messages.patch delete mode 100644 config/grub/patches/0004-prefix/0003-don-t-print-errors-if-GRUB_ERR_FILE_NOT_FOUND.patch (limited to 'config/grub/patches') diff --git a/config/grub/patches/0004-prefix/0003-don-t-print-empty-error-messages.patch b/config/grub/patches/0004-prefix/0003-don-t-print-empty-error-messages.patch new file mode 100644 index 00000000..25221c9c --- /dev/null +++ b/config/grub/patches/0004-prefix/0003-don-t-print-empty-error-messages.patch @@ -0,0 +1,31 @@ +From e5b7ec81421487e71bcaf8b6b5a27f3649a62753 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Sun, 5 Nov 2023 17:25:20 +0000 +Subject: [PATCH 1/1] don't print empty error messages + +this is part two of the quest to kill the prefix +error message. after i disabled prefix-related +messages, it still printed "error: ." on screen. + +Signed-off-by: Leah Rowe +--- + grub-core/kern/err.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c +index 53c734de7..7cac53983 100644 +--- a/grub-core/kern/err.c ++++ b/grub-core/kern/err.c +@@ -107,7 +107,8 @@ grub_print_error (void) + { + if (grub_errno != GRUB_ERR_NONE) + { +- grub_err_printf (_("error: %s.\n"), grub_errmsg); ++ if (grub_strlen(grub_errmsg) > 0) ++ grub_err_printf (_("error: %s.\n"), grub_errmsg); + grub_err_printed_errors++; + } + } +-- +2.39.2 + diff --git a/config/grub/patches/0004-prefix/0003-don-t-print-errors-if-GRUB_ERR_FILE_NOT_FOUND.patch b/config/grub/patches/0004-prefix/0003-don-t-print-errors-if-GRUB_ERR_FILE_NOT_FOUND.patch deleted file mode 100644 index 5ecae825..00000000 --- a/config/grub/patches/0004-prefix/0003-don-t-print-errors-if-GRUB_ERR_FILE_NOT_FOUND.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f80b344cd3ebd098ba6e63aa1ee97a6223ffe7f0 Mon Sep 17 00:00:00 2001 -From: Leah Rowe -Date: Sun, 5 Nov 2023 17:25:20 +0000 -Subject: [PATCH 1/1] don't print errors if GRUB_ERR_FILE_NOT_FOUND - -this is part two of the quest to kill the prefix -error message. after i disabled prefix-related -messages, it still printed "error: ." on screen. - -Signed-off-by: Leah Rowe ---- - grub-core/kern/err.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c -index 53c734de7..c9488b748 100644 ---- a/grub-core/kern/err.c -+++ b/grub-core/kern/err.c -@@ -107,7 +107,8 @@ grub_print_error (void) - { - if (grub_errno != GRUB_ERR_NONE) - { -- grub_err_printf (_("error: %s.\n"), grub_errmsg); -+ if (grub_errno != GRUB_ERR_FILE_NOT_FOUND) -+ grub_err_printf (_("error: %s.\n"), grub_errmsg); - grub_err_printed_errors++; - } - } --- -2.39.2 - -- cgit v1.2.1