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

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

Browse source 
* util/grub-mkdevicemap.c (make_device_map): Actually replace all
        instances of grub_util_get_disk_name() (see previous commit).
This commit is contained in:
robertmh 2008-09-25 14:40:59 +00:00
parent 0e981d36bb
commit add6f17a17
2 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2008-09-25 Robert Millan <rmh@aybabtu.com>
* conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove * conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove

25
util/grub-mkdevicemap.c
View file

@ -483,10 +483,7 @@ make_device_map (const char *device_map, int floppy_disks)
get_virtio_disk_name (name, i); get_virtio_disk_name (name, i);
if (check_device (name)) if (check_device (name))
{ {
char *p; fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
p = grub_util_get_disk_name (num_hd, name);
fprintf (fp, "(%s)\t%s\n", p, name);
free (p);
num_hd++; num_hd++;
} }
} }
@ -512,10 +509,7 @@ make_device_map (const char *device_map, int floppy_disks)
get_xvd_disk_name (name, i); get_xvd_disk_name (name, i);
if (check_device (name)) if (check_device (name))
{ {
char *p; fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
p = grub_util_get_disk_name (num_hd, name);
fprintf (fp, "(%s)\t%s\n", p, name);
free (p);
num_hd++; num_hd++;
} }
} }
@ -573,10 +567,7 @@ make_device_map (const char *device_map, int floppy_disks)
get_cciss_disk_name (name, controller, drive); get_cciss_disk_name (name, controller, drive);
if (check_device (name)) if (check_device (name))
{ {
char *p; fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
p = grub_util_get_disk_name (num_hd, name);
fprintf (fp, "(%s)\t%s\n", p, name);
free (p);
num_hd++; num_hd++;
} }
} }
@ -597,10 +588,7 @@ make_device_map (const char *device_map, int floppy_disks)
get_ida_disk_name (name, controller, drive); get_ida_disk_name (name, controller, drive);
if (check_device (name)) if (check_device (name))
{ {
char *p; fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
p = grub_util_get_disk_name (num_hd, name);
fprintf (fp, "(%s)\t%s\n", p, name);
free (p);
num_hd++; num_hd++;
} }
} }
@ -632,10 +620,7 @@ make_device_map (const char *device_map, int floppy_disks)
get_mmc_disk_name (name, i); get_mmc_disk_name (name, i);
if (check_device (name)) if (check_device (name))
{ {
char *p; fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
p = grub_util_get_disk_name (num_hd, name);
fprintf (fp, "(%s)\t%s\n", p, name);
free (p);
num_hd++; num_hd++;
} }
} }