vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2007-05-01 Robert Millan <rmh@aybabtu.com>

Browse source 
* util/grub-emu.c: Move initialization functions
	grub_util_biosdisk_init() and grub_init_all() before
	grub_util_biosdisk_get_grub_dev(), which relies on them.
This commit is contained in:
robertmh 2007-04-30 22:22:24 +00:00
parent 41f0050ea9
commit b06a264da4
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-05-01 Robert Millan <rmh@aybabtu.com>
* util/grub-emu.c: Move initialization functions
grub_util_biosdisk_init() and grub_init_all() before
grub_util_biosdisk_get_grub_dev(), which relies on them.
2007-04-19 Robert Millan <rmh@aybabtu.com> 2007-04-19 Robert Millan <rmh@aybabtu.com>
* util/powerpc/ieee1275/grub-install.in: Initialize ${bindir}, since * util/powerpc/ieee1275/grub-install.in: Initialize ${bindir}, since

10
util/grub-emu.c
View file

@ -182,6 +182,11 @@ main (int argc, char *argv[])
sleep (1); sleep (1);
} }
/* XXX: This is a bit unportable. */
grub_util_biosdisk_init (args.dev_map);
grub_init_all ();
/* Make sure that there is a root device. */ /* Make sure that there is a root device. */
if (! args.root_dev) if (! args.root_dev)
{ {
@ -199,11 +204,6 @@ main (int argc, char *argv[])
sprintf (prefix, "%s%s", args.root_dev, dir); sprintf (prefix, "%s%s", args.root_dev, dir);
free (dir); free (dir);
/* XXX: This is a bit unportable. */
grub_util_biosdisk_init (args.dev_map);
grub_init_all ();
/* Start GRUB! */ /* Start GRUB! */
if (setjmp (main_env) == 0) if (setjmp (main_env) == 0)
grub_main (); grub_main ();