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

fs_mgr: fix mount_all when handling already mounted encryptable fs.

Browse source 
Since 38afe5f4ba
  fs_mgr_mount_all() will try to behave more like "mount -a"

So prevent inaccessible or busy (already mounted) encryptable filesystems
from mounting tmpfs in their mount points.


Change-Id: I32e5b3e26f2138d1e4d9ef8ba01c1466f8051d39
This commit is contained in:
Mohamad Ayyash 2014-03-12 15:00:06 -07:00 committed by JP Abgrall
parent 38afe5f4ba
commit 611f5e960c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/fs_mgr.c
View file

@ -260,9 +260,9 @@ int fs_mgr_mount_all(struct fstab *fstab)
/* back up errno as partition_wipe clobbers the value */
mount_errno = errno;
/* mount(2) returned an error, check if it's encryptable and deal with it */
if ((fstab->recs[i].fs_mgr_flags & MF_CRYPT) &&
if (mount_errno != EBUSY && mount_errno != EACCES &&
(fstab->recs[i].fs_mgr_flags & MF_CRYPT) &&
!partition_wiped(fstab->recs[i].blk_device)) {
/* Need to mount a tmpfs at this mountpoint for now, and set
* properties that vold will query later for decrypting