2010-01-22 Vladimir Serbinenko <phcoder@gmail.com>

	* kern/ieee1275/init.c (grub_machine_set_prefix): Don't check for
	presence of "prefix" variable as it breaks when normal.mod is
	embedded.

diff --git a/ChangeLog b/ChangeLog
index f227f5dbc76bf783a08592ac0118e213d027c3a2..5eef8a8212aee692bdfd52d60fa5cb47afeda258 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * kern/ieee1275/init.c (grub_machine_set_prefix): Don't check for
+       presence of "prefix" variable as it breaks when normal.mod is
+       embedded.
+
 2010-01-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * term/ieee1275/ofconsole.c (grub_ofconsole_dimensions): Allocate on

diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index 04e4e2dcabf62a11da324143a9bce0c28c8b2140..f3a4f4d81c4537bfab4c3a7cd17eded42d622050 100644 (file)
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -75,10 +75,6 @@ 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_prefix[0])
     {
       grub_env_set ("prefix", grub_prefix);