Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We now also find a boot partition, if nested inside another partition. Booting from logical partitions should now work properly.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12188 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-03-31 11:28:33 +00:00
parent a7c536d8ba
commit 0a0a999076
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/kernel/core/fs/vfs.cpp
View File

@ -17,6 +17,7 @@
#include <disk_device_manager/KDiskDevice.h> #include <disk_device_manager/KDiskDevice.h>
#include <disk_device_manager/KDiskDeviceManager.h> #include <disk_device_manager/KDiskDeviceManager.h>
#include <disk_device_manager/KDiskDeviceUtils.h> #include <disk_device_manager/KDiskDeviceUtils.h>
#include <disk_device_manager/KPartitionVisitor.h>
#include <disk_device_manager/KDiskSystem.h> #include <disk_device_manager/KDiskSystem.h>
#include <KPath.h> #include <KPath.h>
#include <syscalls.h> #include <syscalls.h>
@ -2754,30 +2755,26 @@ vfs_mount_boot_file_system(kernel_args *args)
// ToDo: do this for real! It will currently only use the partition offset; // ToDo: do this for real! It will currently only use the partition offset;
// it does not yet use the disk_identifier information. // it does not yet use the disk_identifier information.
// It does also only search the first level.
KPartition *bootPartition = NULL; KPartition *bootPartition = NULL;
struct BootPartitionVisitor : KPartitionVisitor {
BootPartitionVisitor(off_t offset) : fOffset(offset) {}
virtual bool VisitPre(KPartition *partition)
{
return (partition->ContainsFileSystem()
&& partition->Offset() == fOffset);
}
private:
off_t fOffset;
} visitor(args->boot_disk.partition_offset);
KDiskDevice *device; KDiskDevice *device;
int32 cookie = 0; int32 cookie = 0;
while ((device = manager->NextDevice(&cookie)) != NULL) { while ((device = manager->NextDevice(&cookie)) != NULL) {
if (device->ContainsFileSystem() bootPartition = device->VisitEachDescendant(&visitor);
&& device->Offset() == args->boot_disk.partition_offset) { if (bootPartition)
bootPartition = device;
break;
}
for (int32 i = device->CountChildren(); i-- > 0; ) {
KPartition *partition = device->ChildAt(i);
if (partition->Offset() == args->boot_disk.partition_offset
&& partition->ContainsFileSystem()) {
bootPartition = partition;
break;
}
}
if (bootPartition != NULL)
break; break;
} }