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

2009-06-13 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
* loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition 
	handling
This commit is contained in:
phcoder 2009-06-13 21:09:11 +00:00
parent 880fc3c4f0
commit 71c79a6b3b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-06-13 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition
handling
2009-06-13 Jun Inoue <jun.lambda@gmail.com> 2009-06-13 Jun Inoue <jun.lambda@gmail.com>
* util/grub-mkconfig.in: Fix parsing of --output option. * util/grub-mkconfig.in: Fix parsing of --output option.

4
loader/i386/multiboot.c
View file

@ -170,7 +170,7 @@ grub_multiboot_get_bootdev (grub_uint32_t *bootdev)
{ {
if ((p[0] >= '0') && (p[0] <= '9')) if ((p[0] >= '0') && (p[0] <= '9'))
{ {
slice = grub_strtoul (p, &p, 0); slice = grub_strtoul (p, &p, 0) - 1;
if ((p) && (p[0] == ',')) if ((p) && (p[0] == ','))
p++; p++;
@ -184,7 +184,7 @@ grub_multiboot_get_bootdev (grub_uint32_t *bootdev)
grub_device_close (dev); grub_device_close (dev);
*bootdev = ((biosdev & 0xff) << 24) | ((slice & 0xff) << 16) *bootdev = ((biosdev & 0xff) << 24) | ((slice & 0xff) << 16)
| ((part & 0xff) << 16) | 0xff; | ((part & 0xff) << 8) | 0xff;
return (biosdev != ~0UL); return (biosdev != ~0UL);
#else #else
*bootdev = 0xffffffff; *bootdev = 0xffffffff;