diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2018-12-05 13:33:17 -0800 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-02 20:04:31 +0000 |
| commit | 62b42c896e379c89848f1c6a486e4ec6c51a966d (patch) | |
| tree | a8ee3783f68586de6712eb2d5d2061240b795c6e /boot_control_android.cc | |
| parent | b5f631d96988a08eda8fbc9adb27110e20c5bac0 (diff) | |
Call fs_mgr_overlayfs_is_setup() in InitPartitionMetadata
As part of userdebug builds, ask the user via logging to tear down
any overlayfs overrides in support of adb remount as it can compete
for some of the same resources that an OTA needs.
Test: compile
Bug: 120034852
Change-Id: I9aef66b9f4a9ff8c3a78a7c7e03b5ee9b6f8196f
Diffstat (limited to 'boot_control_android.cc')
| -rw-r--r-- | boot_control_android.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/boot_control_android.cc b/boot_control_android.cc index c42c8d75..af1a5f96 100644 --- a/boot_control_android.cc +++ b/boot_control_android.cc @@ -26,6 +26,7 @@ #include <bootloader_message/bootloader_message.h> #include <brillo/message_loops/message_loop.h> #include <fs_mgr.h> +#include <fs_mgr_overlayfs.h> #include "update_engine/common/utils.h" #include "update_engine/dynamic_partition_control_android.h" @@ -396,6 +397,13 @@ bool UnmapTargetPartitions(DynamicPartitionControlInterface* dynamic_control, bool BootControlAndroid::InitPartitionMetadata( Slot target_slot, const PartitionMetadata& partition_metadata) { + if (fs_mgr_overlayfs_is_setup()) { + // Non DAP devices can use overlayfs as well. + LOG(WARNING) + << "overlayfs overrides are active and can interfere with our " + "resources.\n" + << "run adb enable-verity to deactivate if required and try again."; + } if (!dynamic_control_->IsDynamicPartitionsEnabled()) { return true; } |