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