[packages/grub2] Rel 3; one more patch from FC (show fs errors)
arekm
arekm at pld-linux.org
Wed Aug 24 16:32:29 CEST 2022
commit 80fd1a8cab95bd2f2f89c6213caccedf7eedbbd6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Aug 24 16:32:02 2022 +0200
Rel 3; one more patch from FC (show fs errors)
...b_fs_probe-dprint-errors-from-filesystems.patch | 43 ++++++++++++++++++++++
grub2.spec | 4 +-
2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/grub2.spec b/grub2.spec
index 2648a6a..138a457 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -144,7 +144,7 @@ Summary(pl.UTF-8): GRUB2 - bootloader dla x86 i ppc
Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2
Name: grub2
Version: 2.06
-Release: 2
+Release: 3
License: GPL v2
Group: Base
Source0: https://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
@@ -167,6 +167,7 @@ Patch12: %{name}-cfg.patch
Patch13: efi-net-fix.patch
Patch14: blscfg.patch
Patch15: 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
+Patch16: 0268-grub_fs_probe-dprint-errors-from-filesystems.patch
URL: http://www.gnu.org/software/grub/
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11.1-1
@@ -536,6 +537,7 @@ Motyw starfield dla GRUB-a.
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
# we don't have C.utf-8 and need an UTF-8 locale for build
sed -i -e 's/LC_ALL=C.UTF-8/LC_ALL=en_US.utf-8/g' po/Makefile* po/Rules*
diff --git a/0268-grub_fs_probe-dprint-errors-from-filesystems.patch b/0268-grub_fs_probe-dprint-errors-from-filesystems.patch
new file mode 100644
index 0000000..1455ae4
--- /dev/null
+++ b/0268-grub_fs_probe-dprint-errors-from-filesystems.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood at redhat.com>
+Date: Fri, 15 Jul 2022 15:39:41 -0400
+Subject: [PATCH] grub_fs_probe(): dprint errors from filesystems
+
+When filesystem detection fails, all that's currently debug-logged is a
+series of messages like:
+
+ grub-core/kern/fs.c:56:fs: Detecting ntfs...
+ grub-core/kern/fs.c:76:fs: ntfs detection failed.
+
+repeated for each filesystem. Any messages provided to grub_error() by
+the filesystem are lost, and one has to break out gdb to figure out what
+went wrong.
+
+With this change, one instead sees:
+
+ grub-core/kern/fs.c:56:fs: Detecting fat...
+ grub-core/osdep/hostdisk.c:357:hostdisk: reusing open device
+ `/path/to/device'
+ grub-core/kern/fs.c:77:fs: error: invalid modification timestamp for /.
+ grub-core/kern/fs.c:79:fs: fat detection failed.
+
+in the debug prints.
+
+Signed-off-by: Robbie Harwood <rharwood at redhat.com>
+(cherry picked from commit 838c79d658797d0662ee7f9e033e38ee88059e02)
+---
+ grub-core/kern/fs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
+index c698295bcb..b58e2ae1d2 100644
+--- a/grub-core/kern/fs.c
++++ b/grub-core/kern/fs.c
+@@ -74,6 +74,7 @@ grub_fs_probe (grub_device_t device)
+ if (grub_errno == GRUB_ERR_NONE)
+ return p;
+
++ grub_dprintf ("fs", _("error: %s.\n"), grub_errmsg);
+ grub_error_push ();
+ grub_dprintf ("fs", "%s detection failed.\n", p->name);
+ grub_error_pop ();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/80fd1a8cab95bd2f2f89c6213caccedf7eedbbd6
More information about the pld-cvs-commit
mailing list