tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 1bfb375f: Update primary symlinks after mounting.

Browse source 
* commit '1bfb375f77c093a8e16bef4ddeab2681ca126d56':
  Update primary symlinks after mounting.
This commit is contained in:
Jeff Sharkey 2015-04-30 01:01:37 +00:00 committed by Android Git Automerger
commit ab0e376060
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CommandListener.cpp
View file

@ -199,14 +199,14 @@ int CommandListener::VolumeCmd::runCommand(SocketClient *cli,
int mountFlags = (argc > 3) ? atoi(argv[3]) : 0;
userid_t mountUserId = (argc > 4) ? atoi(argv[4]) : -1;
if (mountFlags & android::vold::VolumeBase::MountFlags::kPrimary) {
vm->setPrimary(vol);
}
vol->setMountFlags(mountFlags);
vol->setMountUserId(mountUserId);
return sendGenericOkFail(cli, vol->mount());
int res = vol->mount();
if (mountFlags & android::vold::VolumeBase::MountFlags::kPrimary) {
vm->setPrimary(vol);
}
return sendGenericOkFail(cli, res);
} else if (cmd == "unmount" && argc > 2) {
// unmount [volId]

1
VolumeManager.cpp
View file

@ -379,6 +379,7 @@ int VolumeManager::linkPrimary(userid_t userId) {
SLOGW("Failed to unlink %s: %s", target.c_str(), strerror(errno));
}
}
LOG(DEBUG) << "Linking " << source << " to " << target;
if (TEMP_FAILURE_RETRY(symlink(source.c_str(), target.c_str()))) {
SLOGW("Failed to link %s to %s: %s", source.c_str(), target.c_str(),
strerror(errno));