From e853e96b40a77a1c89779d9bddd612622f04a62d Mon Sep 17 00:00:00 2001 From: Gaelle Nassiet Date: Mon, 23 Mar 2015 17:51:53 +0100 Subject: [PATCH] always use volume mount option when mounting a partition From ROS, if enable adb using the vol.up and vol.down buttons, the /system partition is mounted by the function ensure_path_mounted() but with hardcoded mount options. As a consequence, the blocks are modified and the reboot in MOS is blocked by the dm_verity feature that detects a corruption. This patch forces the function ensure_path_mounted() to use the mount options from the volume structure, that were previously read from the fstab. Change-Id: I748d32c14cb821f4aae5bcc430089dab45375515 Signed-off-by: Gaelle Nassiet Signed-off-by: Jeremy Compostella --- roots.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roots.cpp b/roots.cpp index 0d47577b..c067bccb 100644 --- a/roots.cpp +++ b/roots.cpp @@ -115,7 +115,7 @@ int ensure_path_mounted(const char* path) { } else if (strcmp(v->fs_type, "ext4") == 0 || strcmp(v->fs_type, "vfat") == 0) { result = mount(v->blk_device, v->mount_point, v->fs_type, - MS_NOATIME | MS_NODEV | MS_NODIRATIME, ""); + v->flags, v->fs_options); if (result == 0) return 0; LOGE("failed to mount %s (%s)\n", v->mount_point, strerror(errno));