* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_floppy):

	Return 0 if disk isn't biosdisk.

diff --git a/ChangeLog b/ChangeLog
index a454f2f849814ad794c39b0ff84cd8808fa425d6..9d19fe4509b1a3004ef72ce17c506323d8f2ab9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_floppy):
+       Return 0 if disk isn't biosdisk.
+
 2011-09-17  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
        * Makefile.util.def (grub-mkrelpath): Add LIBUTIL for getrawpartition(3)

diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index b4c4eef7cfa77f3c60e8e304a73cbeb7c7eee38c..a9a8c066ed8f0b422fcb1b0ea8ea35ff74f7fe21 100644 (file)
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -1841,6 +1841,9 @@ grub_util_biosdisk_is_floppy (grub_disk_t disk)
   struct stat st;
   int fd;
 
+  if (disk->dev != &grub_util_biosdisk_dev)
+    return 0;
+
   fd = open (map[disk->id].device, O_RDONLY);
   /* Shouldn't happen.  */
   if (fd == -1)