From add6f17a17574e8577110ccb17c3e5b733a9f37c Mon Sep 17 00:00:00 2001 From: robertmh Date: Thu, 25 Sep 2008 14:40:59 +0000 Subject: [PATCH] 2008-09-25 Robert Millan * util/grub-mkdevicemap.c (make_device_map): Actually replace all instances of grub_util_get_disk_name() (see previous commit). --- ChangeLog | 5 +++++ util/grub-mkdevicemap.c | 25 +++++-------------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36b114245..d615f65eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-25 Robert Millan + + * 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 * conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c index cd9ea1940..fa8b158dc 100644 --- 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++; } }