2007-07-02 Robert Millan <rmh@aybabtu.com>
* conf/i386-efi.rmk: Replace obsolete reference to util/i386/pc/biosdisk.c with util/biosdisk.c, and util/i386/pc/getroot.c with util/getroot.c. * conf/powerpc-ieee1275.rmk: Likewise. * conf/sparc64-ieee1275.rmk: Likewise. * util/grub-emu.c (main): Fix unchecked pointer handling.
This commit is contained in:
parent
2c2a681b39
commit
3572d015fd
8 changed files with 33 additions and 19 deletions
|
@ -181,7 +181,11 @@ main (int argc, char *argv[])
|
|||
/* Make sure that there is a root device. */
|
||||
if (! args.root_dev)
|
||||
{
|
||||
args.root_dev = grub_util_get_grub_dev (grub_guess_root_device (args.dir ? : DEFAULT_DIRECTORY));
|
||||
char *device_name = grub_guess_root_device (args.dir ? : DEFAULT_DIRECTORY);
|
||||
if (! device_name)
|
||||
grub_util_error ("cannot find a device for %s.\n", args.dir ? : DEFAULT_DIRECTORY);
|
||||
|
||||
args.root_dev = grub_util_get_grub_dev (device_name);
|
||||
if (! args.root_dev)
|
||||
{
|
||||
grub_util_info ("guessing the root device failed, because of `%s'",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue