From 3cdfe493badcf54eb6e2cf991ccfd3fce0d5dc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 21 Jun 2004 22:11:32 +0000 Subject: [PATCH] What a great idea to remove the boot partition from the partition list... It's fixed now; mount_file_systems() will just ignore the boot partition. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8105 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/loader/vfs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kernel/boot/loader/vfs.cpp b/src/kernel/boot/loader/vfs.cpp index f469e61d90..10e7d66a70 100644 --- a/src/kernel/boot/loader/vfs.cpp +++ b/src/kernel/boot/loader/vfs.cpp @@ -327,10 +327,6 @@ get_boot_file_system(stage2_args *args) Directory *fileSystem; status_t status = partition->Mount(&fileSystem); - gPartitions.Remove(partition); - // let's remove that partition, so that it is not scanned again - // in mount_file_systems() - if (status < B_OK) { // this partition doesn't contain any known file system; we // don't need it anymore @@ -355,6 +351,10 @@ mount_file_systems(stage2_args *args) Partition *partition = NULL; while ((partition = (Partition *)iterator.Next()) != NULL) { + // don't scan known partitions again + if (partition->IsFileSystem()) + continue; + // remove the partition if it doesn't contain a (known) file system if (partition->Scan(true) != B_OK && !partition->IsFileSystem()) { gPartitions.Remove(partition);