diff options
| author | Ken Sumrall <ksumrall@android.com> | 2012-11-12 11:45:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-12 11:45:33 -0800 |
| commit | b20fa762b515b5e96c158959d8c8d0c2ff1bf46b (patch) | |
| tree | b0a3fd5bd731f149a45a11c7cc6fd21637ae5bc3 | |
| parent | ba70ed9ae7dab75bde317a8dc8886da309831eca (diff) | |
| parent | d42d327c176d5819423f4bf9e211bb12bb5dde72 (diff) | |
| download | system_core-b20fa762b515b5e96c158959d8c8d0c2ff1bf46b.zip system_core-b20fa762b515b5e96c158959d8c8d0c2ff1bf46b.tar.gz system_core-b20fa762b515b5e96c158959d8c8d0c2ff1bf46b.tar.bz2 | |
Merge "Fix fs_mgr to properly invoke e2fsck on encrypted devices" into jb-mr1.1-dev
| -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 538b5be..99adb81 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 */ |