Deleted pieces of code detect MBR-containig device as a FAT-type device,
if it's first partition contains a FAT filesystem. This behaviour enabled one
to mount the FAT FS which is either directly on the device (disk0) or on
the first partition (disk0.0) using the same command:
mount /dev/disk0 /fat
However, the desired behaviour can be reached with a:
mount /dev/disk0 /fat || mount /dev/disk0.0 /fat || echo "Mounting failed"
Signed-off-by: Peter Mamonov <pmamonov@xxxxxxxxx>
Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
common/filetype.c | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/common/filetype.c b/common/filetype.c
index c59441d..f9e03f7 100644
--- a/common/filetype.c
+++ b/common/filetype.c
@@ -345,21 +345,6 @@ enum filetype file_name_detect_type(const char *filename)
type = file_detect_type(buf, ret);
- if (type == filetype_mbr) {
- /*
- * Get the first partition start sector
- * and check for FAT in it
- */
- is_fat_or_mbr(buf, &bootsec);
- ret = lseek(fd, (bootsec) * 512, SEEK_SET);
- if (ret < 0)
- goto err_out;
- ret = read(fd, buf, 512);
- if (ret < 0)
- goto err_out;
- type = is_fat_or_mbr((u8 *)buf, NULL);
- }
-
err_out:
close(fd);
free(buf);
@@ -385,21 +370,6 @@ enum filetype cdev_detect_type(const char *name)
type = file_detect_type(buf, ret);
- if (type == filetype_mbr) {
- unsigned long bootsec;
- /*
- * Get the first partition start sector
- * and check for FAT in it
- */
- is_fat_or_mbr(buf, &bootsec);
-
- ret = cdev_read(cdev, buf, 512, bootsec * 512, 0);
- if (ret < 0)
- goto err_out;
-
- type = is_fat_or_mbr((u8 *)buf, NULL);
- }
-
err_out:
free(buf);
cdev_close(cdev);
--
2.1.4
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
