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.
This commit is contained in:
parent
71538dff79
commit
1885bb2790
2 changed files with 9 additions and 0 deletions
|
@ -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>
|
2006-04-25 Hollis Blanchard <hollis@penguinppc.org>
|
||||||
|
|
||||||
* kern/misc.c (abort): New alias for grub_abort.
|
* kern/misc.c (abort): New alias for grub_abort.
|
||||||
|
|
|
@ -69,6 +69,10 @@ grub_machine_set_prefix (void)
|
||||||
char *filename;
|
char *filename;
|
||||||
char *prefix;
|
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,
|
if (grub_ieee1275_get_property (grub_ieee1275_chosen, "bootpath", &bootpath,
|
||||||
sizeof (bootpath), 0))
|
sizeof (bootpath), 0))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue