On Mon, Aug 24, 2009 at 1:43 AM, Vladimir 'phcoder'
Serbinenko<phco...@gmail.com> wrote:
> On Mon, Aug 24, 2009 at 12:59 AM, Robert Millan<r...@aybabtu.com> wrote:
>> On Sun, Aug 23, 2009 at 11:05:47PM +0200, Vladimir 'phcoder' Serbinenko
>> wrote:
>>> It broke grub-install. I already fixed it.
>>
>> Sorry, and thanks! :-)
>>
> Actually my first fix wasn't ok for efi and LVM users. New fix opens
> new door: currently grub-probe transforms partition name into module
> name. Why not actually make them coincide? E.g. rename
> 'msdos_partition_map' to 'part_msdos' ?
> This would simplify the code
Patch for it
>> --
>> Robert Millan
>>
>> The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
>> how) you may access your data; but nobody's threatening your freedom: we
>> still allow you to remove your data and not access it at all."
>>
>>
>> _______________________________________________
>> Grub-devel mailing list
>> Grub-devel@gnu.org
>> http://lists.gnu.org/mailman/listinfo/grub-devel
>>
>
>
>
> --
> Regards
> Vladimir 'phcoder' Serbinenko
>
> Personal git repository: http://repo.or.cz/w/grub2/phcoder.git
>
--
Regards
Vladimir 'phcoder' Serbinenko
Personal git repository: http://repo.or.cz/w/grub2/phcoder.git
diff --git a/ChangeLog b/ChangeLog
index 80d3f89..759b53d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,18 @@
-2009-08-23 Vladimir Serbinenko <phco...@gmail.com>
-
- Fix grub-install.
+2009-08-24 Vladimir Serbinenko <phco...@gmail.com>
- * util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.
+ 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-23 Vladimir Serbinenko <phco...@gmail.com>
* fs/hfsplus.c (grub_hfsplus_mount): Don't ignore grub_hfsplus_read_file
diff --git a/partmap/acorn.c b/partmap/acorn.c
index 42fd61f..e005975 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 ffb807f..dce9f4f 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 04ccff1..4dea55a 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 e860f35..4a49574 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 9fc620d..d0fc18e 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 ce6d588..e816ec1 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 1bb9cd3..dbb25bc 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 c8dbc01..affa1c8 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -80,7 +80,6 @@ static void
probe_partmap (grub_disk_t disk)
{
char *name;
- char *underscore;
if (disk->partition == NULL)
{
@@ -92,12 +91,7 @@ probe_partmap (grub_disk_t disk)
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);
+ printf ("%s\n", name);
free (name);
}
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 8a3e2ef..a06ecca 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 0dc2e2c..7f38c42 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;
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
