ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 39087653: am 13d62278: Merge "Skip mounting /, just mark block device as ro if needed."

Browse source 
* commit '390876539ec12115268710762d86d8c4c5738c25':
  Skip mounting /, just mark block device as ro if needed.
This commit is contained in:
Daniel Rosenberg 2015-08-04 01:07:07 +00:00 • committed by Android Git Automerger
commit 88f82b6650
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/fs_mgr.c
View file

@ -527,6 +527,14 @@ int fs_mgr_mount_all(struct fstab *fstab)
continue; continue;
} }
/* Skip mounting the root partition, as it will already have been mounted */
if (!strcmp(fstab->recs[i].mount_point, "/")) {
if ((fstab->recs[i].fs_mgr_flags & MS_RDONLY) != 0) {
fs_mgr_set_blk_ro(fstab->recs[i].blk_device);
}
continue;
}
/* Translate LABEL= file system labels into block devices */ /* Translate LABEL= file system labels into block devices */
if (!strcmp(fstab->recs[i].fs_type, "ext2") || if (!strcmp(fstab->recs[i].fs_type, "ext2") ||
!strcmp(fstab->recs[i].fs_type, "ext3") || !strcmp(fstab->recs[i].fs_type, "ext3") ||