mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-27 23:34:51 +00:00
e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 11 Sep 2018 15:58:29 -0400
|
|
Subject: [PATCH] Add more dprintf, and nerf dprintf in script.c
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/disk/diskfilter.c | 3 +++
|
|
grub-core/disk/efi/efidisk.c | 1 +
|
|
grub-core/kern/device.c | 1 +
|
|
grub-core/script/script.c | 5 +++++
|
|
4 files changed, 10 insertions(+)
|
|
|
|
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
|
|
index c3b578acf25..1a3eb6b8d77 100644
|
|
--- a/grub-core/disk/diskfilter.c
|
|
+++ b/grub-core/disk/diskfilter.c
|
|
@@ -188,6 +188,8 @@ scan_disk (const char *name, int accept_diskfilter)
|
|
grub_disk_t disk;
|
|
static int scan_depth = 0;
|
|
|
|
+ grub_dprintf ("diskfilter", "scanning %s\n", name);
|
|
+
|
|
if (!accept_diskfilter && is_valid_diskfilter_name (name))
|
|
return 0;
|
|
|
|
@@ -1211,6 +1213,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
|
|
the same. */
|
|
if (pv->disk && grub_disk_get_size (disk) >= pv->part_size)
|
|
return GRUB_ERR_NONE;
|
|
+ grub_dprintf ("diskfilter", "checking %s\n", disk->name);
|
|
pv->disk = grub_disk_open (disk->name);
|
|
if (!pv->disk)
|
|
return grub_errno;
|
|
diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
|
|
index 9e20af70ee0..54c227b1c84 100644
|
|
--- a/grub-core/disk/efi/efidisk.c
|
|
+++ b/grub-core/disk/efi/efidisk.c
|
|
@@ -855,6 +855,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
|
|
return 0;
|
|
}
|
|
|
|
+ grub_dprintf ("efidisk", "getting disk for %s\n", device_name);
|
|
parent = grub_disk_open (device_name);
|
|
grub_free (dup_dp);
|
|
|
|
diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c
|
|
index 73b8ecc0c09..f58b58c89d5 100644
|
|
--- a/grub-core/kern/device.c
|
|
+++ b/grub-core/kern/device.c
|
|
@@ -34,6 +34,7 @@ grub_device_open (const char *name)
|
|
{
|
|
grub_device_t dev = 0;
|
|
|
|
+ grub_dprintf ("device", "opening device %s\n", name);
|
|
if (! name)
|
|
{
|
|
name = grub_env_get ("root");
|
|
diff --git a/grub-core/script/script.c b/grub-core/script/script.c
|
|
index ec4d4337c66..844e8343ca7 100644
|
|
--- a/grub-core/script/script.c
|
|
+++ b/grub-core/script/script.c
|
|
@@ -22,6 +22,11 @@
|
|
#include <grub/parser.h>
|
|
#include <grub/mm.h>
|
|
|
|
+#ifdef grub_dprintf
|
|
+#undef grub_dprintf
|
|
+#endif
|
|
+#define grub_dprintf(no, fmt, ...)
|
|
+
|
|
/* It is not possible to deallocate the memory when a syntax error was
|
|
found. Because of that it is required to keep track of all memory
|
|
allocations. The memory is freed in case of an error, or assigned
|