i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

At least if we hit the boot volume override the hardcoded check for BFS. This

Browse Source 
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
This commit is contained in:
Michael Lotz
2009-03-14 15:29:49 +00:00
parent 0db890095c
commit 3e37362327
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/os/find_directory.c
+2 -2
View File
@@ -196,12 +196,12 @@ find_directory(directory_which which, dev_t device, bool createIt,
switch (which) { switch (which) {
/* Per volume directories */ /* Per volume directories */
case B_DESKTOP_DIRECTORY: case B_DESKTOP_DIRECTORY:
if (!strcmp(fsInfo.fsh_name, "bfs")) if (device == bootDevice || !strcmp(fsInfo.fsh_name, "bfs"))
template = "$h/Desktop"; template = "$h/Desktop";
break; break;
case B_TRASH_DIRECTORY: case B_TRASH_DIRECTORY:
// TODO: eventually put that into the file system API? // 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"; template = "$h/Desktop/Trash";
else if (!strcmp(fsInfo.fsh_name, "dos")) else if (!strcmp(fsInfo.fsh_name, "dos"))
template = "RECYCLED/_BEOS_"; template = "RECYCLED/_BEOS_";