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

2007-10-15 Robert Millan <rmh@aybabtu.com>

Browse source 
* normal/misc.c (grub_normal_print_device_info): Do not probe for
	filesystem when dev->disk is unset.
	Do probe for filesystem even when dev->disk->has_partitions is set.
	In case a filesystem is found, always report it.
	In case it isn't, if dev->disk->has_partitions is set, report that
	a partition table was found instead of reporting that no filesystem
	could be identified.
This commit is contained in:
robertmh 2007-10-15 10:59:38 +00:00
parent 5db82af689
commit e179b2f4a5
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
normal/misc.c
View file

@ -40,7 +40,7 @@ grub_normal_print_device_info (const char *name)
dev = grub_device_open (name);
if (! dev)
grub_printf ("Filesystem cannot be accessed");
else if (! dev->disk || ! dev->disk->has_partitions || dev->disk->partition)
else if (dev->disk)
{
char *label;
grub_fs_t fs;
@ -49,7 +49,12 @@ grub_normal_print_device_info (const char *name)
/* Ignore all errors. */
grub_errno = 0;
grub_printf ("Filesystem type %s", fs ? fs->name : "unknown");
if (fs)
grub_printf ("Filesystem type %s", fs->name);
else if (! dev->disk->has_partitions || dev->disk->partition)
grub_printf ("Unknown filesystem");
else
grub_printf ("Partition table");
if (fs && fs->label)
{