From 2d21e3e8e0b20a7b19bc66e8f51c1c153d1dc7df Mon Sep 17 00:00:00 2001 From: phcoder Date: Mon, 24 Aug 2009 13:34:03 +0000 Subject: [PATCH] 2009-08-24 Vladimir Serbinenko 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. --- ChangeLog | 21 +++++++++++++++------ partmap/acorn.c | 2 +- partmap/amiga.c | 2 +- partmap/apple.c | 2 +- partmap/gpt.c | 2 +- partmap/msdos.c | 2 +- partmap/sun.c | 2 +- parttool/msdospart.c | 4 ++-- util/grub-probe.c | 15 +-------------- util/hostdisk.c | 2 +- util/i386/pc/grub-setup.c | 4 ++-- 11 files changed, 27 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index d81560913..1efb882bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2009-08-24 Vladimir Serbinenko + + 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 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 - - Fix grub-install. - - * util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'. - 2009-08-23 Vladimir Serbinenko * fs/hfsplus.c (grub_hfsplus_mount): Don't ignore grub_hfsplus_read_file diff --git a/partmap/acorn.c b/partmap/acorn.c index 42fd61f4a..e005975c0 100644 --- a/partmap/acorn.c +++ b/partmap/acorn.c @@ -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 diff --git a/partmap/amiga.c b/partmap/amiga.c index ffb807f5a..dce9f4f1f 100644 --- a/partmap/amiga.c +++ b/partmap/amiga.c @@ -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 diff --git a/partmap/apple.c b/partmap/apple.c index 04ccff146..4dea55a32 100644 --- a/partmap/apple.c +++ b/partmap/apple.c @@ -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 diff --git a/partmap/gpt.c b/partmap/gpt.c index e860f35da..4a4957437 100644 --- a/partmap/gpt.c +++ b/partmap/gpt.c @@ -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 diff --git a/partmap/msdos.c b/partmap/msdos.c index 9fc620df0..d0fc18efe 100644 --- a/partmap/msdos.c +++ b/partmap/msdos.c @@ -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 diff --git a/partmap/sun.c b/partmap/sun.c index ce6d58899..e816ec17a 100644 --- a/partmap/sun.c +++ b/partmap/sun.c @@ -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 diff --git a/parttool/msdospart.c b/parttool/msdospart.c index 1bb9cd3e1..dbb25bc52 100644 --- a/parttool/msdospart.c +++ b/parttool/msdospart.c @@ -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); diff --git a/util/grub-probe.c b/util/grub-probe.c index c8dbc0175..1710ec51b 100644 --- a/util/grub-probe.c +++ b/util/grub-probe.c @@ -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 diff --git a/util/hostdisk.c b/util/hostdisk.c index 8a3e2ef1f..a06ecca2a 100644 --- a/util/hostdisk.c +++ b/util/hostdisk.c @@ -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) diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c index 0dc2e2c31..7f38c4293 100644 --- a/util/i386/pc/grub-setup.c +++ b/util/i386/pc/grub-setup.c @@ -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;