Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch by Vasilis Kaoutsis:

Browse Source 
* Renamed main.c to main.cpp
* Use find_directory() to construct the Bootscript path.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25509 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2008-05-15 12:10:12 +00:00
parent ea26d9f0c2
commit 7c61d84fcd
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/kernel/Jamfile
View File

@ -29,7 +29,7 @@ KernelMergeObject kernel_core.o :
kernel_daemon.cpp
linkhack.c
lock.cpp
main.c
main.cpp
module.cpp
Notifications.cpp
port.cpp

29
src/system/kernel/main.c → src/system/kernel/main.cpp
View File

@ -12,6 +12,7 @@
#include <OS.h>
#include <arch/platform.h>
#include <boot_device.h>
#include <boot_item.h>
#include <boot_splash.h>
#include <cbuf.h>
@ -21,6 +22,8 @@
#include <debug.h>
#include <elf.h>
#include <fs/devfs.h>
#include <fs/KPath.h>
#include <FindDirectory.h>
#include <int.h>
#include <kdevice_manager.h>
#include <kdriver_settings.h>
@ -61,8 +64,17 @@ static uint32 sCpuRendezvous;
static uint32 sCpuRendezvous2;
static int32 main2(void *);
int _start(kernel_args *bootKernelArgs, int cpu); /* keep compiler happy */
#ifdef __cplusplus
extern "C" {
#endif
extern int _start(kernel_args *bootKernelArgs, int cpu);
/* keep compiler happy */
#ifdef __cplusplus
} /* extern "C" */
#endif
int
_start(kernel_args *bootKernelArgs, int currentCPU)
@ -292,8 +304,19 @@ main2(void *unused)
// start the init process
{
const char *args[] = {"/bin/sh", "/boot/beos/system/boot/Bootscript",
NULL};
KPath bootScriptPath;
status_t status = find_directory(B_BEOS_SYSTEM_DIRECTORY, gBootDevice,
false, bootScriptPath.LockBuffer(), bootScriptPath.BufferSize());
if (status != B_OK)
dprintf("main2: find_directory() failed: %s\n", strerror(status));
bootScriptPath.UnlockBuffer();
status = bootScriptPath.Append("boot/Bootscript");
if (status != B_OK) {
dprintf("main2: constructing path to Bootscript failed: "
"%s\n", strerror(status));
}
const char *args[] = { "/bin/sh", bootScriptPath.Path(), NULL };
int32 argc = 2;
thread_id thread;