2008-09-25 Robert Millan <rmh@aybabtu.com>

        * util/grub-mkdevicemap.c (make_device_map): Actually replace all
        instances of grub_util_get_disk_name() (see previous commit).

diff --git a/ChangeLog b/ChangeLog
index 36b114245be206f661137eabb0f644b097aa666c..d615f65ebbc9b5db97fc357872072b3f16f8b925 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-25  Robert Millan  <rmh@aybabtu.com>
+
+       * util/grub-mkdevicemap.c (make_device_map): Actually replace all
+       instances of grub_util_get_disk_name() (see previous commit).
+
 2008-09-25  Robert Millan  <rmh@aybabtu.com>
 
        * conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove

diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index cd9ea1940f4e695edb0310c06dd9a63c8fd4a879..fa8b158dcdfeb71b7d729ff31c3c8846e74e623f 100644 (file)
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -483,10 +483,7 @@ make_device_map (const char *device_map, int floppy_disks)
       get_virtio_disk_name (name, i);
       if (check_device (name))
        {
-         char *p;
-         p = grub_util_get_disk_name (num_hd, name);
-         fprintf (fp, "(%s)\t%s\n", p, name);
-         free (p);
+         fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
          num_hd++;
        }
     }
@@ -512,10 +509,7 @@ make_device_map (const char *device_map, int floppy_disks)
       get_xvd_disk_name (name, i);
       if (check_device (name))
        {
-         char *p;
-         p = grub_util_get_disk_name (num_hd, name);
-         fprintf (fp, "(%s)\t%s\n", p, name);
-         free (p);
+         fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
          num_hd++;
        }
     }
@@ -573,10 +567,7 @@ make_device_map (const char *device_map, int floppy_disks)
            get_cciss_disk_name (name, controller, drive);
            if (check_device (name))
              {
-               char *p;
-               p = grub_util_get_disk_name (num_hd, name);
-               fprintf (fp, "(%s)\t%s\n", p, name);
-               free (p);
+               fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
                num_hd++;
              }
          }
@@ -597,10 +588,7 @@ make_device_map (const char *device_map, int floppy_disks)
            get_ida_disk_name (name, controller, drive);
            if (check_device (name))
              {
-               char *p;
-               p = grub_util_get_disk_name (num_hd, name);
-               fprintf (fp, "(%s)\t%s\n", p, name);
-               free (p);
+               fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
                num_hd++;
              }
          }
@@ -632,10 +620,7 @@ make_device_map (const char *device_map, int floppy_disks)
       get_mmc_disk_name (name, i);
       if (check_device (name))
        {
-         char *p;
-         p = grub_util_get_disk_name (num_hd, name);
-         fprintf (fp, "(%s)\t%s\n", p, name);
-         free (p);
+         fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
          num_hd++;
        }
     }