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

22
util/grub-probe.c
View file

@ -66,7 +66,8 @@ enum {
PRINT_EFI_HINT,
PRINT_ARC_HINT,
PRINT_COMPATIBILITY_HINT,
PRINT_MSDOS_PARTTYPE
PRINT_MSDOS_PARTTYPE,
PRINT_DISK
};
static int print = PRINT_FS;
@ -343,6 +344,23 @@ probe (const char *path, char **device_names, char delim)
return;
}
if (print == PRINT_DISK)
{
for (curdev = device_names; *curdev; curdev++)
{
char *disk;
disk = grub_util_get_os_disk (*curdev);
if (!disk)
{
grub_print_error ();
continue;
}
printf ("%s", disk);
putchar (delim);
}
return;
}
for (curdev = device_names; *curdev; curdev++)
{
grub_util_pull_device (*curdev);
@ -753,6 +771,8 @@ argp_parser (int key, char *arg, struct argp_state *state)
print = PRINT_ARC_HINT;
else if (!strcmp (arg, "compatibility_hint"))
print = PRINT_COMPATIBILITY_HINT;
else if (!strcmp (arg, "disk"))
print = PRINT_DISK;
else
argp_usage (state);
break;