diff options
Diffstat (limited to 'Source/Kernel/Shell/KernelShell.class.cpp')
| -rw-r--r-- | Source/Kernel/Shell/KernelShell.class.cpp | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/Source/Kernel/Shell/KernelShell.class.cpp b/Source/Kernel/Shell/KernelShell.class.cpp index f35b4dc..71a717a 100644 --- a/Source/Kernel/Shell/KernelShell.class.cpp +++ b/Source/Kernel/Shell/KernelShell.class.cpp @@ -3,9 +3,8 @@ #include <DeviceManager/Kbd.ns.h> #include <SimpleList.class.h> #include <MemoryManager/PhysMem.ns.h> -#include <VFS/VFS.ns.h> -#include <FileSystems/RamFS/RamFS.class.h> #include <TaskManager/Task.ns.h> +#include <VFS/VFS.ns.h> u32int KernelShell::m_instances = 0; @@ -62,6 +61,7 @@ u32int KernelShell::run() { {"uptime", &KernelShell::uptime}, {"part", &KernelShell::part}, {"readblock", &KernelShell::readblock}, + {"mount", &KernelShell::mount}, {"hexdump", &KernelShell::hexdump}, {0, 0} @@ -84,6 +84,9 @@ u32int KernelShell::run() { *m_vt << " - free shows memory usage (frames and kheap)\n"; *m_vt << " - uptime shows seconds since boot\n"; *m_vt << " - part shows all detected block devs and partitions\n"; + *m_vt << " - mount shows mounted devices or mounts a ramfs\n"; + *m_vt << " - readblock reads a block from a block device and dumps it\n"; + *m_vt << " - hexdump shows a hexadecimal dump of a file\n"; *m_vt << " - Standard UNIX commands : ls cd cat pwd rm mkdir wf\n"; *m_vt << " - Scroll up with shift+pgup !\n"; } else if (tokens[0] == "reboot") { @@ -95,31 +98,6 @@ u32int KernelShell::run() { } else if (tokens[0] == "exit") { if (tokens.size() == 1) return 0; return tokens[1].toInt(); - } else if (tokens[0] == "mount") { - if (tokens.size() == 1) { - for (u32int i = 0; i < VFS::filesystems.size(); i++) { - *m_vt << VFS::path(VFS::filesystems[i]->getRootNode()) << "\n"; - } - } else if (tokens.size() == 3) { - if (tokens[1] == "ramfs") { - FSNode* n = VFS::find(tokens[2], m_cwd); - if (n == 0) { - *m_vt << "No such directory.\n"; - } else if (n->type() != NT_DIRECTORY) { - *m_vt << "Not a directory.\n"; - } else { - if (RamFS::mount(100000, (DirectoryNode*)n) != 0) { - *m_vt << "Ok...\n"; - } else { - *m_vt << "Error !\n"; - } - } - } else { - *m_vt << "Not supported yet.\n"; - } - } else { - *m_vt << "Usage: mount [<device> <mountpoint>\n"; - } } else if (tokens[0] == "unmount") { if (tokens.size() == 2) { FSNode* n = VFS::find(tokens[1], m_cwd); |