grub2/0103-util-grub-mkimage.c-generate_image-Fix-size-of-publi.patch

45 lines
1.3 KiB
Diff
Raw Normal View History

2013-06-07 18:03:56 +00:00
From 10d401fa8e217dab7d3bea3bc75ce2ab7248b42a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 13 Jan 2013 01:47:46 +0000
Subject: [PATCH 103/482] * util/grub-mkimage.c (generate_image): Fix "size of
public key" info message.
---
ChangeLog | 5 +++++
util/grub-mkimage.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 14bff81..784d737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-01-13 Colin Watson <cjwatson@ubuntu.com>
+ * util/grub-mkimage.c (generate_image): Fix "size of public key"
+ info message.
+
+2013-01-13 Colin Watson <cjwatson@ubuntu.com>
+
Remove nested functions from PCI iterators.
* grub-core/bus/pci.c (grub_pci_iterate): Add hook_data argument,
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 23a9970..d0eecf2 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -740,8 +740,8 @@ generate_image (const char *dir, const char *prefix,
{
size_t curs;
curs = ALIGN_ADDR (grub_util_get_image_size (pubkey_paths[i]));
- grub_util_info ("the size of public key is 0x%llx",
- (unsigned long long) pubkey_paths[i]);
+ grub_util_info ("the size of public key %zd is 0x%llx",
+ i, (unsigned long long) curs);
total_module_size += curs + sizeof (struct grub_module_header);
}
}
--
2013-06-07 18:03:56 +00:00
1.8.2.1