diff options
| author | Cody Schuffelen <schuffelen@google.com> | 2019-12-04 20:09:22 +0000 |
|---|---|---|
| committer | Cody Schuffelen <schuffelen@google.com> | 2019-12-04 20:14:42 +0000 |
| commit | b4ccf58f5d8dba0fc68ef6b418288f1b013be98a (patch) | |
| tree | 40f76f3c3bd78c63bdcad50a42bc0ff31486a6c5 | |
| parent | 72763da1810ad18b3eedb9acb08fa128b4c2401e (diff) | |
| download | cuttlefish_common-b4ccf58f5d8dba0fc68ef6b418288f1b013be98a.tar.gz | |
Revert "Switch to f2fs userdata by default"
Reason for revert: b/145635613 : mkfs.f2fs is not present on the host image.
Change-Id: I9e0b27b4aaba0ada0360df2385ab51abb0f7f0f3
Bug: 142424832
Bug: 142803849
Bug: 145635613
| -rw-r--r-- | host/commands/assemble_cvd/data_image.cc | 8 | ||||
| -rw-r--r-- | host/commands/assemble_cvd/flags.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/host/commands/assemble_cvd/data_image.cc b/host/commands/assemble_cvd/data_image.cc index 70fe0ef5..82dad14b 100644 --- a/host/commands/assemble_cvd/data_image.cc +++ b/host/commands/assemble_cvd/data_image.cc @@ -15,9 +15,9 @@ const int FSCK_ERROR_CORRECTED = 1; const int FSCK_ERROR_CORRECTED_REQUIRES_REBOOT = 2; bool ForceFsckImage(const char* data_image) { - int fsck_status = cvd::execute({"/sbin/fsck.f2fs", "-y", "-f", data_image}); + int fsck_status = cvd::execute({"/sbin/e2fsck", "-y", "-f", data_image}); if (fsck_status & ~(FSCK_ERROR_CORRECTED|FSCK_ERROR_CORRECTED_REQUIRES_REBOOT)) { - LOG(ERROR) << "`fsck.f2fs -y -f " << data_image << "` failed with code " + LOG(ERROR) << "`e2fsck -y -f " << data_image << "` failed with code " << fsck_status; return false; } @@ -46,9 +46,9 @@ bool ResizeImage(const char* data_image, int data_image_mb) { if (!fsck_success) { return false; } - int resize_status = cvd::execute({"/sbin/resize.f2fs", data_image}); + int resize_status = cvd::execute({"/sbin/resize2fs", data_image}); if (resize_status != 0) { - LOG(ERROR) << "`resize.f2fs " << data_image << "` failed with code " + LOG(ERROR) << "`resize2fs " << data_image << "` failed with code " << resize_status; return false; } diff --git a/host/commands/assemble_cvd/flags.cc b/host/commands/assemble_cvd/flags.cc index a83d6fdb..c5a8c36c 100644 --- a/host/commands/assemble_cvd/flags.cc +++ b/host/commands/assemble_cvd/flags.cc @@ -35,7 +35,7 @@ DEFINE_string(data_policy, "use_existing", "How to handle userdata partition." "'always_create'."); DEFINE_int32(blank_data_image_mb, 0, "The size of the blank data image to generate, MB."); -DEFINE_string(blank_data_image_fmt, "f2fs", +DEFINE_string(blank_data_image_fmt, "ext4", "The fs format for the blank data image. Used with mkfs."); DEFINE_string(qemu_gdb, "", "Debug flag to pass to qemu. e.g. -qemu_gdb=tcp::1234"); |