summaryrefslogtreecommitdiff
path: root/Kernel/init.cpp
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2018-10-17 10:55:43 +0200
committerAndreas Kling <awesomekling@gmail.com>2018-10-17 10:57:23 +0200
commit9171521752b0b382f1f70453b4f24915999144b9 (patch)
treea3bb1e3533e591c4693ce98b245870e4da5daede /Kernel/init.cpp
parentaec8ab0a606a1ccb3eaf5816ef85e3951c2d5227 (diff)
downloadserenity-9171521752b0b382f1f70453b4f24915999144b9.zip
Integrate ext2 from VFS into Kernel.
Diffstat (limited to 'Kernel/init.cpp')
-rw-r--r--Kernel/init.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index bd3aee7755..ba0bdee0ff 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -12,13 +12,13 @@
#include "StdLib.h"
#include "Syscall.h"
#include "CMOS.h"
-#include "FileSystem.h"
#include "Userspace.h"
#include "IDEDiskDevice.h"
#include <VirtualFileSystem/NullDevice.h>
#include <VirtualFileSystem/ZeroDevice.h>
#include <VirtualFileSystem/FullDevice.h>
#include <VirtualFileSystem/RandomDevice.h>
+#include <VirtualFileSystem/Ext2FileSystem.h>
#include <AK/OwnPtr.h>
#if 0
@@ -127,7 +127,6 @@ void init()
banner();
Disk::initialize();
- FileSystem::initialize();
auto dev_hd0 = IDEDiskDevice::create();
auto dev_null = make<NullDevice>();
@@ -135,6 +134,9 @@ void init()
auto dev_zero = make<ZeroDevice>();
auto dev_random = make<RandomDevice>();
+ auto e2fs = Ext2FileSystem::create(dev_hd0.copyRef());
+ e2fs->initialize();
+
// new Task(motd_main, "motd", IPC::Handle::MotdTask, Task::Ring0);
new Task(user_main, "user", IPC::Handle::UserTask, Task::Ring3);