vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
(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.
This commit is contained in:
Colin Watson 2011-04-21 10:26:29 +01:00
parent b13f79a427
commit 92051871b7
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2011-04-21 Colin Watson <cjwatson@ubuntu.com>
Fix stack pointer handling in 16-bit relocator. Fix stack pointer handling in 16-bit relocator.

3
grub-core/kern/emu/getroot.c
View file

@ -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. */ /* Now scan visible mounts for the ones we're interested in. */
for (i = entry_len - 1; i >= 0; i--) for (i = entry_len - 1; i >= 0; i--)
{ {
if (entries[i].major != 0)
continue; /* not a virtual device */
if (!*entries[i].device) if (!*entries[i].device)
continue; continue;