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

2007-05-16 Jeroen Dekkers <jeroen@dekkers.cx>

Browse source 
* util/getroot.c (grub_guess_root_device): Remove RAID and LVM
	code, first search for device in /dev/mapper, then in /dev.
	(grub_util_get_grub_dev): New function.
	* include/grub/util/getroot.h (grub_util_get_grub_dev): Add
	prototype.
	* util/grub-probe.c (probe): Remove check for RAID, call
	grub_util_get_grub_dev() instead of
	grub_util_biosdisk_get_grub_dev().
	* util/grub-emu.c (main): Call grub_util_get_grub_dev() instead of
	grub_util_biosdisk_get_grub_dev().
	* util/i386/pc/grub-setup.c (main): Likewise.
This commit is contained in:
jeroen 2007-05-16 21:38:44 +00:00
parent 8fff7c2f2a
commit 849d55d3d1
6 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -669,7 +669,7 @@ main (int argc, char *argv[])
if (! dest_dev)
{
/* Possibly, the user specified an OS device file. */
dest_dev = grub_util_biosdisk_get_grub_dev (argv[optind]);
dest_dev = grub_util_get_grub_dev (argv[optind]);
if (! dest_dev)
{
fprintf (stderr, "Invalid device `%s'.\n", argv[optind]);
@ -703,7 +703,7 @@ main (int argc, char *argv[])
}
else
{
root_dev = grub_util_biosdisk_get_grub_dev (grub_guess_root_device (dir ? : DEFAULT_DIRECTORY));
root_dev = grub_util_get_grub_dev (grub_guess_root_device (dir ? : DEFAULT_DIRECTORY));
if (! root_dev)
{
grub_util_info ("guessing the root device failed, because of `%s'",
@ -743,7 +743,7 @@ main (int argc, char *argv[])
dir ? : DEFAULT_DIRECTORY,
boot_file ? : DEFAULT_BOOT_FILE,
core_file ? : DEFAULT_CORE_FILE,
root_dev, grub_util_biosdisk_get_grub_dev (devicelist[i]), 1);
root_dev, grub_util_get_grub_dev (devicelist[i]), 1);
}
free (raid_prefix);