2008-06-06 Robert Millan <rmh@aybabtu.com>
* util/grub-emu.c (grub_machine_init): Move code in this function from here ... (main): ... to here (before grub_util_biosdisk_init() call, to prevent segfault in case grub_printf() is called). * util/i386/pc/grub-install.in: Append `--device-map=${device_map}' to grub_probe. Update all users not to explicitly add it again. (grub_device): New variable; contains corresponding device for grubdir. (fs_module, partmap_module, devabstraction_module): Pass `--device ${grub_device}' to grub_probe to avoid traversing /dev every time.
This commit is contained in:
parent
9ece62fb9f
commit
25d6b3273b
3 changed files with 25 additions and 5 deletions
|
@ -71,8 +71,6 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
|
|||
void
|
||||
grub_machine_init (void)
|
||||
{
|
||||
signal (SIGINT, SIG_IGN);
|
||||
grub_console_init ();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -183,6 +181,9 @@ main (int argc, char *argv[])
|
|||
sleep (1);
|
||||
}
|
||||
|
||||
signal (SIGINT, SIG_IGN);
|
||||
grub_console_init ();
|
||||
|
||||
/* XXX: This is a bit unportable. */
|
||||
grub_util_biosdisk_init (dev_map);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue