diff options
| author | Ken Sumrall <ksumrall@android.com> | 2012-11-12 11:50:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-12 11:50:22 -0800 |
| commit | 1626b98c5b1d4755f0f146698d487732dcc0a2cc (patch) | |
| tree | 9eac06c19050abb5f98fb723f436c801ad2d03d8 /fs_mgr | |
| parent | 1ca4b7d26a46d7b779a687f43f2c30ea779693de (diff) | |
| parent | 7fd51b36dabedee4de159213237e71ba20865812 (diff) | |
| download | system_core-1626b98c5b1d4755f0f146698d487732dcc0a2cc.tar.gz system_core-1626b98c5b1d4755f0f146698d487732dcc0a2cc.tar.bz2 system_core-1626b98c5b1d4755f0f146698d487732dcc0a2cc.zip | |
am 7fd51b36: am b20fa762: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev
* commit '7fd51b36dabedee4de159213237e71ba20865812':
Fix fs_mgr to properly invoke e2fsck on encrypted devices
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 2bcc9c49c..e51c9cff0 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -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 */ /* First check the filesystem if requested */ 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) { - 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 */ |