* grub-core/kern/emu/getroot.c

(grub_find_root_device_from_mountinfo): Remove non-virtual-device
test that was incorrectly reintroduced in r3214.
Reported by: Ian Dall.  Fixes Savannah bug #33133.

diff --git a/ChangeLog b/ChangeLog
index 98d3b0ea86b6795dc3aa4b4d1f7cf33056dfd05d..1142cf81de6a81a130b67766b13ec04683ed2253 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-21  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/kern/emu/getroot.c
+       (grub_find_root_device_from_mountinfo): Remove non-virtual-device
+       test that was incorrectly reintroduced in r3214.
+       Reported by: Ian Dall.  Fixes Savannah bug #33133.
+
 2011-04-21  Colin Watson  <cjwatson@ubuntu.com>
 
        Fix stack pointer handling in 16-bit relocator.

diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
index f836a66257be91a43f06c815b358c2d60c7c4b67..a274f3c06b3e35e7c5820284f34f488ba3b02eea 100644 (file)
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -216,9 +216,6 @@ grub_find_root_device_from_mountinfo (const char *dir, char **relroot)
   /* Now scan visible mounts for the ones we're interested in.  */
   for (i = entry_len - 1; i >= 0; i--)
     {
-      if (entries[i].major != 0)
-       continue; /* not a virtual device */
-
       if (!*entries[i].device)
        continue;