[2525] 2009-08-24 Vladimir Serbinenko <[email protected]>

Revision: 2525
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2525
Author:   phcoder
Date:     2009-08-24 13:34:03 +0000 (Mon, 24 Aug 2009)
Log Message:
-----------
2009-08-24  Vladimir Serbinenko  <[email protected]>

	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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/partmap/acorn.c
    trunk/grub2/partmap/amiga.c
    trunk/grub2/partmap/apple.c
    trunk/grub2/partmap/gpt.c
    trunk/grub2/partmap/msdos.c
    trunk/grub2/partmap/sun.c
    trunk/grub2/parttool/msdospart.c
    trunk/grub2/util/grub-probe.c
    trunk/grub2/util/hostdisk.c
    trunk/grub2/util/i386/pc/grub-setup.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/ChangeLog	2009-08-24 13:34:03 UTC (rev 2525)
@@ -1,5 +1,20 @@
 2009-08-24  Vladimir Serbinenko  <[email protected]>
 
+	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  <[email protected]>
+
 	Fix OpenBSD and NetBSD support.
 
 	* include/grub/i386/bsd.h (GRUB_BSD_TEMP_BUFFER): Change to resolve
@@ -41,12 +56,6 @@
 
 2009-08-23  Vladimir Serbinenko  <[email protected]>
 
-	Fix grub-install.
-
-	* util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.
-
-2009-08-23  Vladimir Serbinenko  <[email protected]>
-
 	* fs/hfsplus.c (grub_hfsplus_mount): Don't ignore grub_hfsplus_read_file
 	errors.
 	(grub_hfsplus_btree_iterate_node): Don't ignore grub_hfsplus_read_file

Modified: trunk/grub2/partmap/acorn.c
===================================================================
--- trunk/grub2/partmap/acorn.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/partmap/acorn.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -189,7 +189,7 @@
 /* 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

Modified: trunk/grub2/partmap/amiga.c
===================================================================
--- trunk/grub2/partmap/amiga.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/partmap/amiga.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -198,7 +198,7 @@
 /* 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

Modified: trunk/grub2/partmap/apple.c
===================================================================
--- trunk/grub2/partmap/apple.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/partmap/apple.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -241,7 +241,7 @@
 /* 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

Modified: trunk/grub2/partmap/gpt.c
===================================================================
--- trunk/grub2/partmap/gpt.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/partmap/gpt.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -176,7 +176,7 @@
 /* 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

Modified: trunk/grub2/partmap/msdos.c
===================================================================
--- trunk/grub2/partmap/msdos.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/partmap/msdos.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -303,7 +303,7 @@
 /* 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

Modified: trunk/grub2/partmap/sun.c
===================================================================
--- trunk/grub2/partmap/sun.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/partmap/sun.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -196,7 +196,7 @@
 /* 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

Modified: trunk/grub2/parttool/msdospart.c
===================================================================
--- trunk/grub2/parttool/msdospart.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/parttool/msdospart.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -140,10 +140,10 @@
 
 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);
 

Modified: trunk/grub2/util/grub-probe.c
===================================================================
--- trunk/grub2/util/grub-probe.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/util/grub-probe.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -79,26 +79,13 @@
 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

Modified: trunk/grub2/util/hostdisk.c
===================================================================
--- trunk/grub2/util/hostdisk.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/util/hostdisk.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -949,7 +949,7 @@
       {
  	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)

Modified: trunk/grub2/util/i386/pc/grub-setup.c
===================================================================
--- trunk/grub2/util/i386/pc/grub-setup.c	2009-08-24 13:20:24 UTC (rev 2524)
+++ trunk/grub2/util/i386/pc/grub-setup.c	2009-08-24 13:34:03 UTC (rev 2525)
@@ -279,7 +279,7 @@
       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 @@
 	      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;