From 01b023f2329c2c5b3421231ff7ad3c7a214ac27c Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 20 Aug 2011 18:32:03 +0800 Subject: [PATCH] Modules/InitRD - Added new files, and re-added debug - Using it in real hardware/PXE testing --- Modules/Filesystems/InitRD/files.lst | 5 ++++- Modules/Filesystems/InitRD/main.c | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Modules/Filesystems/InitRD/files.lst b/Modules/Filesystems/InitRD/files.lst index 141e45d7..6d7c8424 100644 --- a/Modules/Filesystems/InitRD/files.lst +++ b/Modules/Filesystems/InitRD/files.lst @@ -9,13 +9,16 @@ Dir "Bin" { File "mount" "../../../Usermode/Output/i386/Bin/mount" File "pcidump" "../../../Usermode/Output/i386/Bin/pcidump" File "ifconfig" "../../../Usermode/Output/i386/Bin/ifconfig" + File "telnet" "../../../Usermode/Output/i386/Bin/telnet" + File "irc" "../../../Usermode/Output/i386/Bin/irc" } Dir "Libs" { File "ld-acess.so" "../../../Usermode/Output/i386/Libs/ld-acess.so" + File "libld-acess.so" "../../../Usermode/Output/i386/Libs/libld-acess.so" File "libc.so" "../../../Usermode/Output/i386/Libs/libc.so" File "libgcc.so" "../../../Usermode/Output/i386/Libs/libgcc.so" File "libreadline.so" "../../../Usermode/Output/i386/Libs/libreadline.so" - File "libreadline.so" "../../../Usermode/Output/i386/Libs/libnet.so" + File "libnet.so" "../../../Usermode/Output/i386/Libs/libnet.so" } Dir "Conf" { File "BootConf.cfg" "../../../Usermode/Filesystem/Conf/BootConf.cfg" diff --git a/Modules/Filesystems/InitRD/main.c b/Modules/Filesystems/InitRD/main.c index e5781915..9a783896 100644 --- a/Modules/Filesystems/InitRD/main.c +++ b/Modules/Filesystems/InitRD/main.c @@ -30,6 +30,7 @@ tVFS_Driver gInitRD_FSInfo = { */ int InitRD_Install(char **Arguments) { + Log_Notice("InitRD", "Installed"); VFS_AddDriver( &gInitRD_FSInfo ); return MODULE_ERR_OK; @@ -43,6 +44,7 @@ tVFS_Node *InitRD_InitDevice(const char *Device, const char **Arguments) #if DUMP_ON_MOUNT InitRD_DumpDir( &gInitRD_RootNode, 0 ); #endif + Log_Notice("InitRD", "Mounted"); return &gInitRD_RootNode; } @@ -89,7 +91,7 @@ tVFS_Node *InitRD_FindDir(tVFS_Node *Node, const char *Name) int i; tInitRD_File *dir = Node->ImplPtr; - //Log("InirRD_FindDir: Name = '%s'", Name); + LOG("Name = '%s'", Name); for( i = 0; i < Node->Size; i++ ) { @@ -111,7 +113,7 @@ void InitRD_DumpDir(tVFS_Node *Node, int Indent) for( i = 0; i < Node->Size; i++ ) { - //Log("%s- %p %s", indent, dir[i].Node, dir[i].Name); + Log_Debug("InitRD", "%s- %p %s", indent, dir[i].Node, dir[i].Name); if(dir[i].Node->Flags & VFS_FFLAG_DIRECTORY) InitRD_DumpDir(dir[i].Node, Indent+1); } -- 2.20.1