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

* Makefile.util.def (grub-mkdevicemap): Removed.

Browse source 
* include/grub/emu/hostdisk.h (grub_util_get_os_disk): New proto.
	* include/grub/util/deviceiter.h: Removed.
	* util/deviceiter.c: Likewise.
	* util/getroot.c (grub_util_get_os_disk): New function.
	* util/grub-install.in: Remove grub-mkdevicemap. Use -t disk as
	replacement for EFI.
	* util/grub-mkdevicemap.c: Removed.
	* util/grub-probe.c (probe): Handle PRINT_DISK.
	(argp_parser): Handle -t disk.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-03 22:36:51 +01:00
parent 8e1e4e3903
commit 8be63f2ef6
9 changed files with 66 additions and 1175 deletions
Download patch file Download diff file Expand all files Collapse all files

17
util/getroot.c
View file

@ -1906,6 +1906,23 @@ device_is_wholedisk (const char *os_dev)
}
#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */
char *
grub_util_get_os_disk (const char *os_dev)
{
struct stat st;
grub_util_info ("Looking for %s", os_dev);
if (stat (os_dev, &st) < 0)
{
grub_error (GRUB_ERR_BAD_DEVICE, "cannot stat `%s'", os_dev);
grub_util_info ("cannot stat `%s'", os_dev);
return 0;
}
return convert_system_partition_to_system_disk (os_dev, &st);
}
char *
grub_util_biosdisk_get_grub_dev (const char *os_dev)
{