Fix merge error in NetBSD code.

diff --git a/ChangeLog b/ChangeLog
index 53a664d2fc17b9543aacd7a15437c00b1e8f6123..1348c91c692704f1da87d06b348747898f56ffaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-20  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+       * kern/emu/hostdisk.c (grub_util_biosdisk_get_grub_dev) [__NetBSD__]:
+       Fix merge error in NetBSD code.
+       (find_partition_start) [__NetBSD__]: Likewise.
+
 2010-05-19  BVK Chaitanya  <bvk.groups@gmail.com>
 
        Fix grub-mkrescue usage unit testing.

diff --git a/kern/emu/hostdisk.c b/kern/emu/hostdisk.c
index 0ab25ec7d608678a054742168c6d545da163cbfb..9c469755224d2f3aff80eb3458b1427c123cfcb1 100644 (file)
--- a/kern/emu/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -412,7 +412,8 @@ devmapper_fail:
   fd = open (dev, O_RDONLY);
   if (fd == -1)
     {
-      grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk geometry", dev);
+      grub_error (GRUB_ERR_BAD_DEVICE,
+                 "cannot open `%s' while attempting to get disk geometry", dev);
       return 0;
     }
 
@@ -434,9 +435,6 @@ devmapper_fail:
 # if !defined(__NetBSD__)
   return hdg.start;
 # else /* defined(__NetBSD__) */
-  /* Since dev and convert_system_partition_to_system_disk (dev) are
-   * different, we know that dev is of the form /dev/r[wsc]d[0-9]+[a-z]
-   * and in particular it cannot be a floppy device.  */
   index = dev[strlen(dev) - 1] - 'a';
 
   if (index >= label.d_npartitions)
@@ -1433,7 +1431,6 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     /* Since os_dev and convert_system_partition_to_system_disk (os_dev) are
      * different, we know that os_dev is of the form /dev/r[wsc]d[0-9]+[a-z]
      * and in particular it cannot be a floppy device.  */
-    index = os_dev[strlen(os_dev) - 1] - 'a';
 # endif /* !defined(__NetBSD__) */
 
     start = find_partition_start (os_dev);