Preserve options on remount in commitChanges
Copy the existing mount options when remounting f2fs for checkpointing
mode.
Bug: 123376509
Test: Boot with checkpointing, and ensure entries match fstab
Change-Id: If022d9872a44657b550ab892259230805716dc77
diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index 7586a6c..1b85b16 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -114,8 +114,10 @@
if (fs_mgr_is_checkpoint_fs(fstab_rec)) {
if (!strcmp(fstab_rec->fs_type, "f2fs")) {
+ std::string options = mount_rec->fs_options;
+ options += ",checkpoint=enable";
if (mount(mount_rec->blk_device, mount_rec->mount_point, "none",
- MS_REMOUNT | fstab_rec->flags, "checkpoint=enable")) {
+ MS_REMOUNT | fstab_rec->flags, options.c_str())) {
return Status::fromExceptionCode(EINVAL, "Failed to remount");
}
}