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

gRoot is now a RootFileSystem, not just a Directory anymore.

Browse Source 
register_boot_file_system() adds the "boot" link to the root fs.
mount_all_file_systems() now prints out the root directory of the
mounted volumes just for fun (to be removed later).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5099 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2003-10-21 03:58:40 +00:00
parent ace56d68aa
commit 6822f1482e
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/kernel/boot/loader/vfs.cpp
View File

@ -58,7 +58,7 @@ class Descriptor {
NodeList gBootDevices; NodeList gBootDevices;
NodeList gPartitions; NodeList gPartitions;
Directory *gRoot; RootFileSystem *gRoot;
static Descriptor *sDescriptors[MAX_VFS_DESCRIPTORS]; static Descriptor *sDescriptors[MAX_VFS_DESCRIPTORS];
static Node *sBootDevice; static Node *sBootDevice;
@ -184,14 +184,6 @@ Directory::Type() const
} }
status_t
Directory::AddNode(Node */*node*/)
{
// just don't do anything
return B_ERROR;
}
// #pragma mark - // #pragma mark -
@ -291,6 +283,13 @@ vfs_init(stage2_args *args)
} }
void
register_boot_file_system(Directory *volume)
{
gRoot->AddLink("boot", volume);
}
/** Gets the boot device, scans all of its partitions, gets the /** Gets the boot device, scans all of its partitions, gets the
* boot partition, and mounts its file system. * boot partition, and mounts its file system.
* Returns the file system's root node or NULL for failure. * Returns the file system's root node or NULL for failure.
@ -378,6 +377,24 @@ mount_file_systems(stage2_args *args)
if (gPartitions.IsEmpty()) if (gPartitions.IsEmpty())
return B_ENTRY_NOT_FOUND; return B_ENTRY_NOT_FOUND;
void *cookie;
if (gRoot->Open(&cookie, O_RDONLY) == B_OK) {
Directory *directory;
while (gRoot->GetNextNode(cookie, (Node **)&directory) == B_OK) {
char name[256];
if (directory->GetName(name, sizeof(name)) == B_OK)
printf(":: %s\n", name);
void *subCookie;
if (directory->Open(&subCookie, O_RDONLY) == B_OK) {
while (directory->GetNextEntry(subCookie, name, sizeof(name)) == B_OK) {
printf("\t%s\n", name);
}
directory->Close(subCookie);
}
}
gRoot->Close(cookie);
}
return B_OK; return B_OK;
} }