diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-11-29 17:06:47 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-11-29 17:06:47 +0100 |
| commit | 32ffa508b6ee9c9b36e3a054d218ee90caea4c8b (patch) | |
| tree | 4136164e7fb52005d57782c9ae70da89eca85807 /Source/Kernel/Core | |
| parent | 2be9def10e048b3245bb14e9fb57324c11c527d6 (diff) | |
| download | Melon-32ffa508b6ee9c9b36e3a054d218ee90caea4c8b.tar.gz Melon-32ffa508b6ee9c9b36e3a054d218ee90caea4c8b.zip | |
make qemu-hdd now works great
Diffstat (limited to 'Source/Kernel/Core')
| -rw-r--r-- | Source/Kernel/Core/Log.ns.cpp | 3 | ||||
| -rw-r--r-- | Source/Kernel/Core/kmain.wtf.cpp | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Source/Kernel/Core/Log.ns.cpp b/Source/Kernel/Core/Log.ns.cpp index c8ccd80..d51aa55 100644 --- a/Source/Kernel/Core/Log.ns.cpp +++ b/Source/Kernel/Core/Log.ns.cpp @@ -1,5 +1,6 @@ #include "Log.ns.h" #include <FileSystems/RamFS/RamFS.class.h> +#include <VTManager/SimpleVT.class.h> #include <VFS/VFS.ns.h> namespace Log { @@ -13,7 +14,7 @@ void init(u8int loglevel) { logs[KL_PANIC] = new TextFile("/System/Logs/Panic.log", FM_APPEND); if (!logs[KL_PANIC]->valid()) { //FS maybee not read/write, mount a ramfs - RamFS::mount(1024*1024, (DirectoryNode*)VFS::find("/System/Logs")); + VFS::mount("/System/Logs:ramfs", kvt); logs[KL_PANIC] = new TextFile("/System/Logs/Panic.log", FM_APPEND); } if (KL_CRITICAL <= loglevel) logs[KL_CRITICAL] = new TextFile("/System/Logs/Critical.log", FM_APPEND); diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index 3eee14b..ad11eaf 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -203,7 +203,14 @@ void kmain(multiboot_info_t* mbd, u32int magic) { VFS::mount(mount[i], kvt, mbd); } - //FATFS::mount(Part::partitions[0], (DirectoryNode*)VFS::createDirectory("/Mount")); + { + TextFile mounts("/System/Configuration/Mount", FM_READ); + while (mounts.valid() && !mounts.eof()) { + String m = mounts.readLine(); + if (!m.empty() && m[0] != WChar("#")) VFS::mount(m, kvt, mbd); + } + } + //*************************************** LOAD SYSTEM STUFF |