mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
9f07d1519c
Merge an upstream commit to correct a missing rename in generic code Signed-off-by: Felix Fietkau <nbd@nbd.name>
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From: David Michael <fedora.dm0@gmail.com>
|
|
Date: Fri, 5 Jul 2019 07:45:59 -0400
|
|
Subject: [PATCH] verifiers: Blocklist fallout cleanup
|
|
|
|
Blocklist fallout cleanup after commit 5c6f9bc15 (generic/blocklist: Fix
|
|
implicit declaration of function grub_file_filter_disable_compression()).
|
|
|
|
Signed-off-by: David Michael <fedora.dm0@gmail.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
|
|
--- a/grub-core/osdep/generic/blocklist.c
|
|
+++ b/grub-core/osdep/generic/blocklist.c
|
|
@@ -59,7 +59,7 @@ grub_install_get_blocklist (grub_device_
|
|
|
|
grub_disk_cache_invalidate_all ();
|
|
|
|
- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
|
|
+ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
|
|
if (file)
|
|
{
|
|
if (grub_file_size (file) != core_size)
|
|
@@ -116,7 +116,7 @@ grub_install_get_blocklist (grub_device_
|
|
|
|
grub_file_t file;
|
|
/* Now read the core image to determine where the sectors are. */
|
|
- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
|
|
+ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
|
|
if (! file)
|
|
grub_util_error ("%s", grub_errmsg);
|
|
|