* grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk

	check.

diff --git a/ChangeLog b/ChangeLog
index ba5e2054f80155f9b8f94aceeb411c3d0034a201..c32d4c6f4aae6195e7a4a04f51fb11d73f5d73bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk
+       check.
+
 2014-04-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL.

diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
index a9dfd8852478a4fc901d0073883d89ee317d876d..6349ccfbaea6ecbe489ae2264ccb8f6994be309a 100644 (file)
--- a/grub-core/commands/verify.c
+++ b/grub-core/commands/verify.c
@@ -835,7 +835,7 @@ grub_pubkey_open (grub_file_t io, const char *filename)
 
   if (!sec)
     return io;
-  if (io->device->disk && io->device->disk->id == GRUB_DISK_DEVICE_MEMDISK_ID)
+  if (io->device->disk && io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID)
     return io;
   fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
   if (!fsuf)