[2322] 2009-06-13 Vladimir Serbinenko

[Vladimir Serbinenko]

Revision: 2322
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2322
Author:   phcoder
Date:     2009-06-13 21:09:11 +0000 (Sat, 13 Jun 2009)
Log Message:
-----------
2009-06-13  Vladimir Serbinenko  <phco...@gmail.com>

        * loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition 
        handling
        

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/i386/multiboot.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-13 09:23:54 UTC (rev 2321)
+++ trunk/grub2/ChangeLog       2009-06-13 21:09:11 UTC (rev 2322)
@@ -1,3 +1,8 @@
+2009-06-13  Vladimir Serbinenko  <phco...@gmail.com>
+
+       * loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition 
+       handling
+       
 2009-06-13  Jun Inoue <jun.lam...@gmail.com>
 
        * util/grub-mkconfig.in: Fix parsing of --output option.

Modified: trunk/grub2/loader/i386/multiboot.c
===================================================================
--- trunk/grub2/loader/i386/multiboot.c 2009-06-13 09:23:54 UTC (rev 2321)
+++ trunk/grub2/loader/i386/multiboot.c 2009-06-13 21:09:11 UTC (rev 2322)
@@ -170,7 +170,7 @@
        {
          if ((p[0] >= '0') && (p[0] <= '9'))
            {
-             slice = grub_strtoul (p, &p, 0);
+             slice = grub_strtoul (p, &p, 0) - 1;
 
              if ((p) && (p[0] == ','))
                p++;
@@ -184,7 +184,7 @@
     grub_device_close (dev);
 
   *bootdev = ((biosdev & 0xff) << 24) | ((slice & 0xff) << 16) 
-    | ((part & 0xff) << 16) | 0xff;
+    | ((part & 0xff) << 8) | 0xff;
   return (biosdev != ~0UL);
 #else
   *bootdev = 0xffffffff;