From c0d88edfec3ccf3d27e4354661764d6130115bf8 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Mon, 5 Jun 2017 09:24:19 -0700 Subject: [PATCH] fs_mgr: call format_f2fs correctly with -f This patch formats f2fs with -f option. Change-Id: I3fc415f35d81f22cbf1eadebc619465d36205927 Signed-off-by: Jaegeuk Kim (cherry picked from commit 0331c2cf7734d44cc4832fbad05b6f3bdb619f92) --- fs_mgr/fs_mgr_format.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs_mgr/fs_mgr_format.cpp b/fs_mgr/fs_mgr_format.cpp index 5705f937f..a03d92c6b 100644 --- a/fs_mgr/fs_mgr_format.cpp +++ b/fs_mgr/fs_mgr_format.cpp @@ -86,13 +86,15 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point, bool crypt_footer) static int format_f2fs(char *fs_blkdev) { - char * args[3]; + char * args[5]; int pid; int rc = 0; - args[0] = (char *)"/sbin/mkfs.f2fs"; - args[1] = fs_blkdev; - args[2] = (char *)0; + args[0] = (char *)"/system/bin/make_f2fs"; + args[1] = (char *)"-f"; + args[2] = (char *)"-O encrypt"; + args[3] = fs_blkdev; + args[4] = (char *)0; pid = fork(); if (pid < 0) { @@ -100,7 +102,7 @@ static int format_f2fs(char *fs_blkdev) } if (!pid) { /* This doesn't return */ - execv("/sbin/mkfs.f2fs", args); + execv(args[0], args); exit(1); } for(;;) {