ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: skip fs_mgr_overlayfs_required_devices w/o overlayfs in kernel" am: cbc4116352

Browse source 
am: c4df6be07e

Change-Id: I24c6ed419bbebf346c7022617f9e267d09c51efc
This commit is contained in:
Mark Salyzyn 2018-11-28 19:45:13 -08:00 • committed by android-build-merger
commit cb802772bf
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -790,6 +790,8 @@ bool fs_mgr_overlayfs_mount_all(const std::vector<const fstab_rec*>& fsrecs) {
}
std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab) {
if (fs_mgr_overlayfs_valid() == OverlayfsValidResult::kNotSupported) return {};
if (fs_mgr_get_entry_for_mount_point(const_cast<struct fstab*>(fstab), kScratchMountPoint)) {
return {};
}