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

* stage2/fsys_fat.c: Fix missdetection of ext2fs as fatfs.

Browse source
This commit is contained in:
robertmh 2003-09-05 01:36:58 +00:00
parent 2e08dad5a8
commit 3c9fc981a2
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2003-09-05 KB Sriram <mail_kb@yahoo.com>
* stage2/fsys_fat.c: Fix missdetection of ext2fs as fatfs.
2003-09-05 Robert Millan <robertmh@gnu.org> 2003-09-05 Robert Millan <robertmh@gnu.org>
* docs/menu.lst (GNU/Linux): Add commented initrd command, which is * docs/menu.lst (GNU/Linux): Add commented initrd command, which is

26
stage2/fsys_fat.c
View file

@ -67,6 +67,7 @@ int
fat_mount (void) fat_mount (void)
{ {
struct fat_bpb bpb; struct fat_bpb bpb;
__u32 magic, first_fat;
/* Check partition type for harddisk */ /* Check partition type for harddisk */
if (((current_drive & 0x80) || (current_slice != 0)) if (((current_drive & 0x80) || (current_slice != 0))
@ -161,6 +162,31 @@ fat_mount (void)
> FAT_SUPER->fat_length)) > FAT_SUPER->fat_length))
return 0; return 0;
/* kbs: Media check on first FAT entry [ported from PUPA] */
if (!devread(FAT_SUPER->fat_offset, 0,
sizeof(first_fat), (char *)&first_fat))
return 0;
if (FAT_SUPER->fat_size == 8)
{
first_fat &= 0x0fffffff;
magic = 0x0fffff00;
}
else if (FAT_SUPER->fat_size == 4)
{
first_fat &= 0x0000ffff;
magic = 0xff00;
}
else
{
first_fat &= 0x00000fff;
magic = 0x0f00;
}
if (first_fat != (magic | bpb.media))
return 0;
FAT_SUPER->cached_fat = - 2 * FAT_CACHE_SIZE; FAT_SUPER->cached_fat = - 2 * FAT_CACHE_SIZE;
return 1; return 1;
} }