aboutsummaryrefslogtreecommitdiffstats
path: root/roots.cpp
diff options
context:
space:
mode:
authorGaelle Nassiet <gaellex.nassiet@intel.com>2015-03-23 17:51:53 +0100
committerJeremy Compostella <jeremy.compostella@intel.com>2015-03-24 11:35:04 +0100
commite853e96b40a77a1c89779d9bddd612622f04a62d (patch)
treed79bc928fe3e0898cb8a6fa41e3dd0e95d82065e /roots.cpp
parent733deb267db3488be408cbe020769108ee6584b0 (diff)
downloadbootable_recovery-e853e96b40a77a1c89779d9bddd612622f04a62d.zip
bootable_recovery-e853e96b40a77a1c89779d9bddd612622f04a62d.tar.gz
bootable_recovery-e853e96b40a77a1c89779d9bddd612622f04a62d.tar.bz2
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 <gaellex.nassiet@intel.com> Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Diffstat (limited to 'roots.cpp')
-rw-r--r--roots.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/roots.cpp b/roots.cpp
index 0d47577..c067bcc 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));