From 5dc81824d625a215b2494818afee782119dd7975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Thu, 15 May 2008 11:55:09 +0000
Subject: [PATCH] Another patch by Vasilis Kaoutsis: Use find_directory() to
 find the runtime_loader when starting teams.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25506 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/system/kernel/team.cpp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp
index d52611891d..a4d7d6ac5c 100644
--- a/src/system/kernel/team.cpp
+++ b/src/system/kernel/team.cpp
@@ -17,9 +17,12 @@
 #include <OS.h>
 
 #include <AutoDeleter.h>
+#include <FindDirectory.h>
 
+#include <boot_device.h>
 #include <elf.h>
 #include <file_cache.h>
+#include <fs/KPath.h>
 #include <heap.h>
 #include <int.h>
 #include <kernel.h>
@@ -1168,14 +1171,28 @@ team_create_thread_start(void *args)
 	}
 
 	free_team_arg(teamArgs);
-		// the arguments are already on the user stack, we no longer need them in this form
+		// the arguments are already on the user stack, we no longer need
+		// them in this form
 
-	// ToDo: don't use fixed paths!
-	err = elf_load_user_image("/boot/beos/system/runtime_loader", team, 0, &entry);
+	// find runtime_loader path
+	KPath runtimeLoaderPath;
+	err = find_directory(B_BEOS_SYSTEM_DIRECTORY, gBootDevice, false,
+		runtimeLoaderPath.LockBuffer(), runtimeLoaderPath.BufferSize());
+	if (err < B_OK) {
+		TRACE(("team_create_thread_start: find_directory() failed: %s\n",
+			strerror(err))); 
+		return err;
+	}
+	runtimeLoaderPath.UnlockBuffer();
+	err = runtimeLoaderPath.Append("runtime_loader");
+
+	if (err == B_OK)
+		err = elf_load_user_image(runtimeLoaderPath.Path(), team, 0, &entry);
 	if (err < B_OK) {
 		// Luckily, we don't have to clean up the mess we created - that's
 		// done for us by the normal team deletion process
-		TRACE(("team_create_thread_start: error when elf_load_user_image() %s\n", strerror(err))); 
+		TRACE(("team_create_thread_start: elf_load_user_image() failed: "
+			"%s\n", strerror(err))); 
 		return err;
 	}