From 0982317beaf792e42248b4b01b1c77ba963ef4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 24 Oct 2008 10:15:39 +0000 Subject: [PATCH] * Workaround for bug #2273 - not pretty but works for now. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28310 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/runtime_loader/runtime_loader.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/system/runtime_loader/runtime_loader.c b/src/system/runtime_loader/runtime_loader.c index 97b9fc0f46..7393200fbf 100644 --- a/src/system/runtime_loader/runtime_loader.c +++ b/src/system/runtime_loader/runtime_loader.c @@ -210,7 +210,7 @@ search_executable_in_path_list(const char *name, const char *pathList, } _kern_close(fd); } - + pathListLen = pathListEnd - pathEnd - 1; pathList = pathEnd + 1; } @@ -397,6 +397,14 @@ runtime_loader(void *_args) gProgramArgs->env[i] += relocationOffset; } + if (!strcmp(gProgramArgs->program_path, + "/boot/beos/system/runtime_loader")) { + // TODO: this is a (temporary) work-around for bug #2273 which causes + // the cache's mutex to be locked twice when starting the runtime_loader + // itself. + return 1; + } + #if DEBUG_RLD close(0); open("/dev/console", 0); /* stdin */ close(1); open("/dev/console", 0); /* stdout */