summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-11-12 01:59:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-12 01:59:11 +0000
commitc3939f08dafd5d0f24a9a8128e42bebde368b304 (patch)
tree10f2c506f225e1d01971b5255942de9377a25ae8
parent9eb0ef6f40a3c84f317fa6548bfe1173e92497d5 (diff)
parente90304c8f14c9d644b8692c460f137c0c7850b69 (diff)
downloadsystem_core-c3939f08dafd5d0f24a9a8128e42bebde368b304.zip
system_core-c3939f08dafd5d0f24a9a8128e42bebde368b304.tar.gz
system_core-c3939f08dafd5d0f24a9a8128e42bebde368b304.tar.bz2
fs_mgr: let fsck.f2fs actually attempt a fix automerge: eb6036a
automerge: e90304c * commit 'e90304c8f14c9d644b8692c460f137c0c7850b69': fs_mgr: let fsck.f2fs actually attempt a fix
-rw-r--r--fs_mgr/fs_mgr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 40878c1..d1e92f2 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -141,9 +141,10 @@ static void check_fs(char *blk_device, char *fs_type, char *target)
} else if (!strcmp(fs_type, "f2fs")) {
char *f2fs_fsck_argv[] = {
F2FS_FSCK_BIN,
+ "-f",
blk_device
};
- INFO("Running %s on %s\n", F2FS_FSCK_BIN, blk_device);
+ INFO("Running %s -f %s\n", F2FS_FSCK_BIN, blk_device);
ret = android_fork_execvp_ext(ARRAY_SIZE(f2fs_fsck_argv), f2fs_fsck_argv,
&status, true, LOG_KLOG | LOG_FILE,