2006-04-25 Hollis Blanchard <hollis@penguinppc.org>

	* kern/powerpc/ieee1275/init.c (grub_machine_set_prefix): Do not
	clobber "prefix", since we may have already set it manually.

diff --git a/ChangeLog b/ChangeLog
index b0181fee017ddf2eaa381265dce1bdac3cad8e4a..41d68d661b3fe4a0371633c9fa92e95d0da2bc15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-25  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * kern/powerpc/ieee1275/init.c (grub_machine_set_prefix): Do not
+       clobber "prefix", since we may have already set it manually.
+
 2006-04-25  Hollis Blanchard  <hollis@penguinppc.org>
 
        * kern/misc.c (abort): New alias for grub_abort.

diff --git a/kern/powerpc/ieee1275/init.c b/kern/powerpc/ieee1275/init.c
index 0f75b893c9e6392f792189955a63480cc638382b..d2913f6bef85f3e9746c82bfda474d9cb0f41e80 100644 (file)
--- a/kern/powerpc/ieee1275/init.c
+++ b/kern/powerpc/ieee1275/init.c
@@ -69,6 +69,10 @@ grub_machine_set_prefix (void)
   char *filename;
   char *prefix;
 
+  if (grub_env_get ("prefix"))
+    /* We already set prefix in grub_machine_init().  */
+    return;
+
   if (grub_ieee1275_get_property (grub_ieee1275_chosen, "bootpath", &bootpath,
                                  sizeof (bootpath), 0))
     {