Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel: VFS root now has to be block device instead of partition

This commit is contained in:
Bananymous 2024-06-14 00:19:12 +03:00
parent a9b0bfa740
commit 6b1d5d28be
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/kernel/FS/VirtualFileSystem.cpp
View File

@ -12,18 +12,18 @@ namespace Kernel
static BAN::RefPtr<VirtualFileSystem> s_instance; static BAN::RefPtr<VirtualFileSystem> s_instance;
void VirtualFileSystem::initialize(BAN::StringView root) void VirtualFileSystem::initialize(BAN::StringView root_path)
{ {
ASSERT(!s_instance); ASSERT(!s_instance);
s_instance = MUST(BAN::RefPtr<VirtualFileSystem>::create()); s_instance = MUST(BAN::RefPtr<VirtualFileSystem>::create());
ASSERT(root.size() >= 5 && root.substring(0, 5) == "/dev/"sv);; ASSERT(root_path.size() >= 5 && root_path.substring(0, 5) == "/dev/"sv);;
root = root.substring(5); root_path = root_path.substring(5);
auto partition_inode = MUST(DevFileSystem::get().root_inode()->find_inode(root)); auto root_inode = MUST(DevFileSystem::get().root_inode()->find_inode(root_path));
if (!partition_inode->is_device() || !static_cast<Device*>(partition_inode.ptr())->is_partition()) if (!root_inode->mode().ifblk())
Kernel::panic("Specified root '/dev/{}' does not name a partition", root); Kernel::panic("Specified root '/dev/{}' does not name a block device", root_path);
s_instance->m_root_fs = MUST(FileSystem::from_block_device(static_cast<BlockDevice*>(partition_inode.ptr()))); s_instance->m_root_fs = MUST(FileSystem::from_block_device(static_cast<BlockDevice*>(root_inode.ptr())));
Credentials root_creds { 0, 0, 0, 0 }; Credentials root_creds { 0, 0, 0, 0 };
MUST(s_instance->mount(root_creds, &DevFileSystem::get(), "/dev"sv)); MUST(s_instance->mount(root_creds, &DevFileSystem::get(), "/dev"sv));