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

* 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

View file

@ -61,4 +61,7 @@ grub_uint64_t
grub_util_get_fd_sectors (int fd, unsigned *log_secsize);
#endif
char *
grub_util_get_os_disk (const char *os_dev);
#endif /* ! GRUB_BIOSDISK_MACHINE_UTIL_HEADER */

View file

@ -1,11 +0,0 @@
#ifndef GRUB_DEVICEITER_MACHINE_UTIL_HEADER
#define GRUB_DEVICEITER_MACHINE_UTIL_HEADER 1
#include <config.h>
void grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
int floppy_disks);
void grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy,
int *num_fd, int *num_hd);
#endif /* ! GRUB_DEVICEITER_MACHINE_UTIL_HEADER */