Disabled support for nested partition maps for the time being. Since

we're quite lenient parsing the partition descriptors, we recognized
pretty much any partition that by accident has a PTS signature and that
no other disk system supports. Should fix bug #2668.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27215 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-08-27 22:36:44 +00:00
parent 4e61552ecd
commit ca2a5874fa
@@ -76,7 +76,7 @@ get_type_for_content_type(const char *contentType, char *type)
{
TRACE(("intel: get_type_for_content_type(%s)\n",
contentType));
if (!contentType || !type)
return B_BAD_VALUE;
@@ -159,6 +159,9 @@ pm_identify_partition(int fd, partition_data *partition, void **cookie)
return 0.5;
}
// NOTE: It seems supporting nested partition maps makes more trouble than it
// has useful applications ATM. So it is disabled for the time being.
#if 0
// We have a parent. That's a very unlikely setup.
if (hasChildren)
return 0.4;
@@ -166,6 +169,8 @@ pm_identify_partition(int fd, partition_data *partition, void **cookie)
// No children. Extremely unlikely, that this is desired. But if no one
// else claims the partition, we take it anyway.
return 0.1;
#endif
return -1;
}
// pm_scan_partition
@@ -179,7 +184,7 @@ pm_scan_partition(int fd, partition_data *partition, void *cookie)
TRACE(("intel: pm_scan_partition(%d, %ld: %lld, %lld, %ld)\n", fd,
partition->id, partition->offset, partition->size,
partition->block_size));
PartitionMapCookie *map = (PartitionMapCookie*)cookie;
// fill in the partition_data structure
partition->status = B_PARTITION_VALID;
@@ -336,7 +341,7 @@ ep_scan_partition(int fd, partition_data *partition, void *cookie)
// (no content_name and content_parameters)
// (content_type is set by the system)
partition->block_size = SECTOR_SIZE;
partition->content_cookie = primary;
// children
status_t error = B_OK;