From 9c642b64542d210b7c4fffa55e02bbe25d824c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 8 Jun 2004 21:35:14 +0000 Subject: [PATCH] Adjusted paths. The stack of the main thread is now called "{team name}_main_stack" instead of primary stack. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7863 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/core/main.c | 2 +- src/kernel/core/team.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kernel/core/main.c b/src/kernel/core/main.c index 5f8b176981..76bbedd31b 100644 --- a/src/kernel/core/main.c +++ b/src/kernel/core/main.c @@ -199,7 +199,7 @@ main2(void *unused) // start the init process { team_id pid; - pid = team_create_team("/boot/bin/init", "init", NULL, 0, NULL, 0, B_NORMAL_PRIORITY); + pid = team_create_team("/bin/init", "init", NULL, 0, NULL, 0, B_NORMAL_PRIORITY); TRACE(("Init started\n")); if (pid < 0) diff --git a/src/kernel/core/team.c b/src/kernel/core/team.c index ebd7ebdf16..eb6e436076 100644 --- a/src/kernel/core/team.c +++ b/src/kernel/core/team.c @@ -519,7 +519,7 @@ team_create_team2(void *args) t->user_stack_base = USER_STACK_REGION + USER_STACK_REGION_SIZE - totalSize; // the exact location at the end of the user stack region - sprintf(ustack_name, "%s_primary_stack", team->name); + sprintf(ustack_name, "%s_main_stack", team->name); t->user_stack_region_id = create_area_etc(team, ustack_name, (void **)&t->user_stack_base, B_EXACT_ADDRESS, totalSize, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA); if (t->user_stack_region_id < 0) { @@ -570,7 +570,7 @@ team_create_team2(void *args) path = teamArgs->path; TRACE(("team_create_team2: loading elf binary '%s'\n", path)); - err = elf_load_user_image("/boot/libexec/rld.so", team, 0, &entry); + err = elf_load_user_image("/boot/beos/system/lib/rld.so", team, 0, &entry); if (err < 0) { // XXX clean up team return err;