Skip to contentSkip to conversation

: Handle lettered OF path partitions on sparc64.

PATCH New David Miller 1 participant 1 message Apr 30, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Handle lettered OF path partitions on sparc64.

OpenBoot uses ":a", ":b", etc. partition specifiers instead of the numbered ":1", ":2", etc. that the generic ieee1275 code expects.

Instead of cruddng up the generic ieee1275 code with this, just convert in the sparc64 specific code beforehand.

Committed.

2009-04-30 David S. Miller <[email protected]>

* kern/sparc64/ieee1275/init.c (grub_machine_set_prefix): If lettered partition specifier is found, convert to numbered.

kern/sparc64/ieee1275/init.c +12 -1
index 5114f76..699f963 100644
@@ -64,8 +64,8 @@ grub_machine_set_prefix (void)
   if (grub_prefix[0] != '(')
     {
       char bootpath[IEEE1275_MAX_PATH_LEN];
+      char *prefix, *path, *colon;
       grub_ssize_t actual;
-      char *prefix, *path;
 
       if (grub_ieee1275_get_property (grub_ieee1275_chosen, "bootpath",
 				      &bootpath, sizeof (bootpath), &actual))
@@ -77,6 +77,17 @@ grub_machine_set_prefix (void)
 	}
 
       /* Transform an OF device path to a GRUB path.  */
+      colon = grub_strchr (bootpath, ':');
+      if (colon)
+	{
+	  char *part = colon + 1;
+
+	  /* Consistently provide numbered partitions to GRUB.
+	     OpenBOOT traditionally uses alphabetical partition
+	     specifiers.  */
+	  if (part[0] >= 'a' && part[0] <= 'z')
+	    part[0] = '1' + (part[0] - 'a');
+	}
       prefix = grub_ieee1275_encode_devname (bootpath);
 
       path = grub_malloc (grub_strlen (grub_prefix)