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

2007-06-13 Robert Millan <rmh@aybabtu.com>

Browse source 
* include/grub/util/misc.h: Define DEFAULT_DIRECTORY and
	DEFAULT_DEVICE_MAP.
	* util/grub-emu.c: Use above definitions from misc.h instead of
	defining them.
	* util/grub-mkdevicemap.c: Likewise.
	* util/i386/pc/grub-setup.c: Likewise.
	* util/grub-probe.c: Likewise.
	(probe): Abort with grub_util_error() when either
	grub_guess_root_device or grub_util_get_grub_dev fails.
This commit is contained in:
robertmh 2007-06-13 16:53:54 +00:00
parent 0215dcbfdc
commit baa574b487
6 changed files with 23 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

9
util/i386/pc/grub-setup.c
View file

@ -50,15 +50,6 @@
#define DEFAULT_BOOT_FILE "boot.img"
#define DEFAULT_CORE_FILE "core.img"
#ifdef __NetBSD__
/* NetBSD uses /boot for its boot block. */
# define DEFAULT_DIRECTORY "/grub"
#else
# define DEFAULT_DIRECTORY "/boot/grub"
#endif
#define DEFAULT_DEVICE_MAP DEFAULT_DIRECTORY "/device.map"
/* This is the blocklist used in the diskboot image. */
struct boot_blocklist
{