Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If none is given pick volume name by mount type

Browse Source
This commit is contained in:
Ingo Weinhold 2011-06-24 12:47:15 +02:00
parent 724fba1b09
commit 1382ade575
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/add-ons/kernel/file_systems/packagefs/Volume.cpp
View File

@ -506,13 +506,30 @@ Volume::Mount(const char* parameterString)
if (stat(packages, &st) < 0) if (stat(packages, &st) < 0)
RETURN_ERROR(B_ERROR); RETURN_ERROR(B_ERROR);
// If no volume name is given, infer it from the mount type.
if (volumeName == NULL) {
switch (fMountType) {
case MOUNT_TYPE_SYSTEM:
volumeName = "system";
break;
case MOUNT_TYPE_COMMON:
volumeName = "common";
break;
case MOUNT_TYPE_HOME:
volumeName = "home";
break;
case MOUNT_TYPE_CUSTOM:
volumeName = "Package FS";
break;
}
}
// create the root node // create the root node
fRootDirectory fRootDirectory
= new(std::nothrow) ::RootDirectory(kRootDirectoryID, st.st_mtim); = new(std::nothrow) ::RootDirectory(kRootDirectoryID, st.st_mtim);
if (fRootDirectory == NULL) if (fRootDirectory == NULL)
RETURN_ERROR(B_NO_MEMORY); RETURN_ERROR(B_NO_MEMORY);
fRootDirectory->Init(NULL, volumeName != NULL ? volumeName : "Package FS", fRootDirectory->Init(NULL, volumeName, 0);
0);
fNodes.Insert(fRootDirectory); fNodes.Insert(fRootDirectory);
// get our mount point // get our mount point