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
This commit is contained in:
Michael Lotz 2009-03-14 15:29:49 +00:00
parent 0db890095c
commit 3e37362327

View File

@ -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_";