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

2009-08-24 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
Rename *_partition_map to part_*

	* partmap/acorn.c (grub_acorn_partition_map): Set name to 'part_acorn'.
	* partmap/amiga.c (grub_amiga_partition_map): Set name to 'part_amiga'.
	* partmap/apple.c (grub_apple_partition_map): Set name to 'part_apple'.
	* partmap/gpt.c (grub_gpt_partition_map): Set name to 'part_gpt'.
	All users updated.
	* partmap/msdos.c (grub_msdos_partition_map): Set name to 'part_msdos'.
	All users updated.
	* partmap/sun.c (grub_sun_partition_map): Set name to 'part_sun'.
	* util/grub-probe.c (probe_partmap): Don't transform partition name
	to get module name.
This commit is contained in:
phcoder 2009-08-24 13:34:03 +00:00
parent dd103c4e04
commit 2d21e3e8e0
11 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
util/grub-probe.c
View file

@ -79,26 +79,13 @@ grub_refresh (void)
static void
probe_partmap (grub_disk_t disk)
{
char *name;
char *underscore;
if (disk->partition == NULL)
{
grub_util_info ("No partition map found for %s", disk->name);
return;
}
name = strdup (disk->partition->partmap->name);
if (! name)
grub_util_error ("Not enough memory");
underscore = strchr (name, '_');
if (! underscore)
grub_util_error ("Invalid partition map %s", name);
*underscore = '\0';
printf ("part_%s\n", name);
free (name);
printf ("%s\n", disk->partition->partmap->name);
}
static int

2
util/hostdisk.c
View file

@ -949,7 +949,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
{
struct grub_msdos_partition *pcdata = NULL;
if (strcmp (partition->partmap->name, "msdos_partition_map") == 0)
if (strcmp (partition->partmap->name, "part_msdos") == 0)
pcdata = partition->data;
if (pcdata)

4
util/i386/pc/grub-setup.c
View file

@ -279,7 +279,7 @@ setup (const char *dir,
if (root_dev->disk->partition)
{
if (strcmp (root_dev->disk->partition->partmap->name,
"msdos_partition_map") == 0)
"part_msdos") == 0)
{
struct grub_msdos_partition *pcdata =
root_dev->disk->partition->data;
@ -287,7 +287,7 @@ setup (const char *dir,
bsd_part = pcdata->bsd_part;
}
else if (strcmp (root_dev->disk->partition->partmap->name,
"gpt_partition_map") == 0)
"part_gpt") == 0)
{
dos_part = root_dev->disk->partition->index;
bsd_part = -1;