a3bdb368a2
- Version bump to 2.06
* rediff
- 0001-add-support-for-UEFI-network-protocols.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- 0003-Make-grub_error-more-verbose.patch
- 0003-bootp-New-net_bootp6-command.patch
- 0005-grub.texi-Add-net_bootp6-doument.patch
- 0006-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
- 0006-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
- 0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- grub-install-force-journal-draining-to-ensure-data-i.patch
- grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
- grub2-diskfilter-support-pv-without-metadatacopies.patch
- grub2-efi-HP-workaround.patch
- grub2-efi-xen-cfg-unquote.patch
- grub2-efi-xen-chainload.patch
- grub2-fix-menu-in-xen-host-server.patch
- grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
- grub2-install-remove-useless-check-PReP-partition-is-empty.patch
- grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch
- grub2-mkconfig-default-entry-correction.patch
- grub2-pass-corret-root-for-nfsroot.patch
- grub2-s390x-03-output-7-bit-ascii.patch
- grub2-s390x-04-grub2-install.patch
- grub2-secureboot-install-signed-grub.patch
- grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
- use-grub2-as-a-package-name.patch
* update by patch squashed:
- 0001-Add-support-for-Linux-EFI-stub-loading-on-aarch64.patch
OBS-URL: https://build.opensuse.org/request/show/904721
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=386
62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
From 3526c4e467ee01a3cfd2f4d627433d078a1ab780 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 27 Aug 2018 13:14:06 -0400
|
|
Subject: [PATCH 3/9] Make grub_error() more verbose
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/kern/efi/mm.c | 17 ++++++++++++++---
|
|
grub-core/kern/err.c | 13 +++++++++++--
|
|
include/grub/err.h | 5 ++++-
|
|
3 files changed, 29 insertions(+), 6 deletions(-)
|
|
|
|
Index: grub-2.06~rc1/grub-core/kern/err.c
|
|
===================================================================
|
|
--- grub-2.06~rc1.orig/grub-core/kern/err.c
|
|
+++ grub-2.06~rc1/grub-core/kern/err.c
|
|
@@ -33,15 +33,24 @@ static struct grub_error_saved grub_erro
|
|
static int grub_error_stack_pos;
|
|
static int grub_error_stack_assert;
|
|
|
|
+#ifdef grub_error
|
|
+#undef grub_error
|
|
+#endif
|
|
+
|
|
grub_err_t
|
|
-grub_error (grub_err_t n, const char *fmt, ...)
|
|
+grub_error (grub_err_t n, const char *file, const int line, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
+ int m;
|
|
|
|
grub_errno = n;
|
|
|
|
+ m = grub_snprintf (grub_errmsg, sizeof (grub_errmsg), "%s:%d:", file, line);
|
|
+ if (m < 0)
|
|
+ m = 0;
|
|
+
|
|
va_start (ap, fmt);
|
|
- grub_vsnprintf (grub_errmsg, sizeof (grub_errmsg), _(fmt), ap);
|
|
+ grub_vsnprintf (grub_errmsg + m, sizeof (grub_errmsg) - m, _(fmt), ap);
|
|
va_end (ap);
|
|
|
|
return n;
|
|
Index: grub-2.06~rc1/include/grub/err.h
|
|
===================================================================
|
|
--- grub-2.06~rc1.orig/include/grub/err.h
|
|
+++ grub-2.06~rc1/include/grub/err.h
|
|
@@ -85,8 +85,11 @@ struct grub_error_saved
|
|
extern grub_err_t EXPORT_VAR(grub_errno);
|
|
extern char EXPORT_VAR(grub_errmsg)[GRUB_MAX_ERRMSG];
|
|
|
|
-grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *fmt, ...)
|
|
- __attribute__ ((format (GNU_PRINTF, 2, 3)));
|
|
+grub_err_t EXPORT_FUNC(grub_error) (grub_err_t n, const char *file, const int line, const char *fmt, ...)
|
|
+ __attribute__ ((format (GNU_PRINTF, 4, 5)));
|
|
+
|
|
+#define grub_error(n, fmt, ...) grub_error (n, __FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
|
+
|
|
void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noreturn));
|
|
void EXPORT_FUNC(grub_error_push) (void);
|
|
int EXPORT_FUNC(grub_error_pop) (void);
|