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

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

View File

@ -1,3 +1,18 @@
2009-08-24 Vladimir Serbinenko <phcoder@gmail.com>
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.
2009-08-24 Vladimir Serbinenko <phcoder@gmail.com>
Fix OpenBSD and NetBSD support.
@ -39,12 +54,6 @@
* loader/i386/bsd.c (netbsd_opts): New entries no-smp and no-acpi.
(netbsd_flags): Add NETBSD_AB_NOSMP, NETBSD_AB_NOACPI.
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
Fix grub-install.
* util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
* fs/hfsplus.c (grub_hfsplus_mount): Don't ignore grub_hfsplus_read_file

View File

@ -189,7 +189,7 @@ acorn_partition_map_get_name (const grub_partition_t p)
/* Partition map type. */
static struct grub_partition_map grub_acorn_partition_map =
{
.name = "Linux/ADFS partition map",
.name = "part_acorn",
.iterate = acorn_partition_map_iterate,
.probe = acorn_partition_map_probe,
.get_name = acorn_partition_map_get_name

View File

@ -198,7 +198,7 @@ amiga_partition_map_get_name (const grub_partition_t p)
/* Partition map type. */
static struct grub_partition_map grub_amiga_partition_map =
{
.name = "amiga_partition_map",
.name = "part_amiga",
.iterate = amiga_partition_map_iterate,
.probe = amiga_partition_map_probe,
.get_name = amiga_partition_map_get_name

View File

@ -241,7 +241,7 @@ apple_partition_map_get_name (const grub_partition_t p)
/* Partition map type. */
static struct grub_partition_map grub_apple_partition_map =
{
.name = "apple_partition_map",
.name = "part_apple",
.iterate = apple_partition_map_iterate,
.probe = apple_partition_map_probe,
.get_name = apple_partition_map_get_name

View File

@ -176,7 +176,7 @@ gpt_partition_map_get_name (const grub_partition_t p)
/* Partition map type. */
static struct grub_partition_map grub_gpt_partition_map =
{
.name = "gpt_partition_map",
.name = "part_gpt",
.iterate = gpt_partition_map_iterate,
.probe = gpt_partition_map_probe,
.get_name = gpt_partition_map_get_name

View File

@ -303,7 +303,7 @@ pc_partition_map_get_name (const grub_partition_t p)
/* Partition map type. */
static struct grub_partition_map grub_msdos_partition_map =
{
.name = "msdos_partition_map",
.name = "part_msdos",
.iterate = pc_partition_map_iterate,
.probe = pc_partition_map_probe,
.get_name = pc_partition_map_get_name

View File

@ -196,7 +196,7 @@ sun_partition_map_get_name (const grub_partition_t p)
/* Partition map type. */
static struct grub_partition_map grub_sun_partition_map =
{
.name = "sun_partition_map",
.name = "part_sun",
.iterate = sun_partition_map_iterate,
.probe = sun_partition_map_probe,
.get_name = sun_partition_map_get_name

View File

@ -140,10 +140,10 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
GRUB_MOD_INIT (pcpart)
{
activate_table_handle = grub_parttool_register ("msdos_partition_map",
activate_table_handle = grub_parttool_register ("part_msdos",
grub_pcpart_boot,
grub_pcpart_bootargs);
type_table_handle = grub_parttool_register ("msdos_partition_map",
type_table_handle = grub_parttool_register ("part_msdos",
grub_pcpart_type,
grub_pcpart_typeargs);

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

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)

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;