From 8423f6f4786102df459edb33c5d5623c6858a7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 14 Oct 2005 11:39:07 +0000 Subject: [PATCH] Instead of blindly trying to load BFS when booted from a boot image, the loader will now respect the selection made by the boot image creator, and just load every file system there is on that image. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14381 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/loader/loader.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/system/boot/loader/loader.cpp b/src/system/boot/loader/loader.cpp index 1b6925fefa..4ef15c19bd 100644 --- a/src/system/boot/loader/loader.cpp +++ b/src/system/boot/loader/loader.cpp @@ -197,9 +197,14 @@ load_modules(stage2_args *args, Directory *volume) } } } else { - // just make sure BFS is loaded - the boot file system - // does not help our decision of what's needed - load_module(volume, "file_systems/bfs"); + // The boot image should only contain the file system + // needed to boot the system, so we just load it. + // ToDo: this is separate from the fall back from above + // as this piece will survive a more intelligent module + // loading approach... + char path[B_FILE_NAME_LENGTH]; + sprintf(path, "%s/%s", sPaths[0], "file_systems"); + load_modules_from(volume, path); } return B_OK;