diff options
| author | Jaegeuk Kim <jaegeuk@google.com> | 2017-11-01 10:35:30 -0700 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-02-09 19:14:32 +0000 |
| commit | 61a3249612495e7a5b2a1950859e9eb43dfc4559 (patch) | |
| tree | e39e7b2ee246d21d5361017db3566e5cae0b06b0 | |
| parent | 92efb9c9cda0683749b87e34c7da823849fbee4d (diff) | |
| download | android_system_vold-61a3249612495e7a5b2a1950859e9eb43dfc4559.tar.gz android_system_vold-61a3249612495e7a5b2a1950859e9eb43dfc4559.tar.bz2 android_system_vold-61a3249612495e7a5b2a1950859e9eb43dfc4559.zip | |
cryptfs: support make_f2fs with quotastaging/lineage-15.1
Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
| -rw-r--r-- | cryptfs.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/cryptfs.cpp b/cryptfs.cpp index 82fef50..f01929a 100644 --- a/cryptfs.cpp +++ b/cryptfs.cpp @@ -2309,16 +2309,19 @@ static int cryptfs_enable_wipe(char *crypto_blkdev, off64_t size, int type) args[0], args[1], args[2], args[3], args[4], args[5]); } else if (type == F2FS_FS) { args[0] = "/system/bin/make_f2fs"; - args[1] = "-t"; + args[1] = "-f"; args[2] = "-d1"; - args[3] = "-f"; - args[4] = "-O encrypt"; - args[5] = crypto_blkdev; + args[3] = "-O"; + args[4] = "encrypt"; + args[5] = "-O"; + args[6] = "quota"; + args[7] = crypto_blkdev; snprintf(size_str, sizeof(size_str), "%" PRId64, size); - args[6] = size_str; - num_args = 7; - SLOGI("Making empty filesystem with command %s %s %s %s %s %s %s\n", - args[0], args[1], args[2], args[3], args[4], args[5], args[6]); + args[8] = size_str; + num_args = 9; + SLOGI("Making empty filesystem with command %s %s %s %s %s %s %s %s %s\n", + args[0], args[1], args[2], args[3], args[4], args[5], + args[6], args[7], args[8]); } else { SLOGE("cryptfs_enable_wipe(): unknown filesystem type %d\n", type); return -1; |