From 3e373623279b31a481e7c3f043b8c6c5475160ec Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 14 Mar 2009 15:29:49 +0000 Subject: [PATCH] At least if we hit the boot volume override the hardcoded check for BFS. This makes the Desktop work when booted from an iso only CD, but I agree with the TODO to move those into the filesystem API. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29518 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/libroot/os/find_directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/libroot/os/find_directory.c b/src/system/libroot/os/find_directory.c index 87aea4232a..99583b1ce0 100644 --- a/src/system/libroot/os/find_directory.c +++ b/src/system/libroot/os/find_directory.c @@ -196,12 +196,12 @@ find_directory(directory_which which, dev_t device, bool createIt, switch (which) { /* Per volume directories */ case B_DESKTOP_DIRECTORY: - if (!strcmp(fsInfo.fsh_name, "bfs")) + if (device == bootDevice || !strcmp(fsInfo.fsh_name, "bfs")) template = "$h/Desktop"; break; case B_TRASH_DIRECTORY: // TODO: eventually put that into the file system API? - if (!strcmp(fsInfo.fsh_name, "bfs")) + if (device == bootDevice || !strcmp(fsInfo.fsh_name, "bfs")) template = "$h/Desktop/Trash"; else if (!strcmp(fsInfo.fsh_name, "dos")) template = "RECYCLED/_BEOS_";