diff options
author | Ken Sumrall | 2012-11-12 13:45:32 -0600 |
---|---|---|
committer | Android (Google) Code Review | 2012-11-12 13:45:33 -0600 |
commit | b20fa762b515b5e96c158959d8c8d0c2ff1bf46b (patch) | |
tree | b0a3fd5bd731f149a45a11c7cc6fd21637ae5bc3 | |
parent | ba70ed9ae7dab75bde317a8dc8886da309831eca (diff) | |
parent | d42d327c176d5819423f4bf9e211bb12bb5dde72 (diff) | |
download | platform-system-core-b20fa762b515b5e96c158959d8c8d0c2ff1bf46b.tar.gz platform-system-core-b20fa762b515b5e96c158959d8c8d0c2ff1bf46b.tar.xz platform-system-core-b20fa762b515b5e96c158959d8c8d0c2ff1bf46b.zip |
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 538b5be22..99adb81d9 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 | |||
523 | /* We found our match */ | 523 | /* We found our match */ |
524 | /* First check the filesystem if requested */ | 524 | /* First check the filesystem if requested */ |
525 | if (fstab[i].fs_mgr_flags & MF_WAIT) { | 525 | if (fstab[i].fs_mgr_flags & MF_WAIT) { |
526 | wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT); | 526 | wait_for_file(n_blk_dev, WAIT_TIMEOUT); |
527 | } | 527 | } |
528 | 528 | ||
529 | if (fstab[i].fs_mgr_flags & MF_CHECK) { | 529 | if (fstab[i].fs_mgr_flags & MF_CHECK) { |
530 | check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point); | 530 | check_fs(n_blk_dev, fstab[i].type, fstab[i].mnt_point); |
531 | } | 531 | } |
532 | 532 | ||
533 | /* Now mount it where requested */ | 533 | /* Now mount it where requested */ |