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

Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev

Browse source
This commit is contained in:
Ken Sumrall 2012-11-12 11:45:32 -08:00 • committed by Android (Google) Code Review
commit b20fa762b5
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

@ -523,11 +523,11 @@ int fs_mgr_do_mount(char *fstab_file, char *n_name, char *n_blk_dev, char *tmp_m
/* We found our match */ /* We found our match */
/* First check the filesystem if requested */ /* First check the filesystem if requested */
if (fstab[i].fs_mgr_flags & MF_WAIT) { if (fstab[i].fs_mgr_flags & MF_WAIT) {
wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT); wait_for_file(n_blk_dev, WAIT_TIMEOUT);
} }
if (fstab[i].fs_mgr_flags & MF_CHECK) { if (fstab[i].fs_mgr_flags & MF_CHECK) {
check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point); check_fs(n_blk_dev, fstab[i].type, fstab[i].mnt_point);
} }
/* Now mount it where requested */ /* Now mount it where requested */