Skip to content
Browse files

am b20fa76: Merge "Fix fs_mgr to properly invoke e2fsck on encrypted …

…devices" into jb-mr1.1-dev

* commit 'b20fa762b515b5e96c158959d8c8d0c2ff1bf46b':
  Fix fs_mgr to properly invoke e2fsck on encrypted devices
  • Loading branch information...
2 parents 270ee0c + b20fa76 commit 7fd51b36dabedee4de159213237e71ba20865812 Ken Sumrall committed with Android Git Automerger Nov 12, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 fs_mgr/fs_mgr.c
View
4 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 */

0 comments on commit 7fd51b3

Please sign in to comment.
Something went wrong with that request. Please try again.