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

Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bff8

Browse source 
am: 7880279ac6

Change-Id: I3aaf4b4506432f5f0a3c82e053886b3e78e65c60
This commit is contained in:
Mark Salyzyn 2019-02-26 00:15:32 -08:00 • committed by android-build-merger
commit b891c46282
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -157,7 +157,12 @@ bool fs_mgr_overlayfs_enabled(FstabEntry* entry) {
fs_mgr_update_logical_partition(entry);
}
auto save_errno = errno;
errno = 0;
auto has_shared_blocks = fs_mgr_has_shared_blocks(entry->mount_point, entry->blk_device);
// special case for first stage init for system as root (taimen)
if (!has_shared_blocks && (errno == ENOENT) && (entry->blk_device == "/dev/root")) {
has_shared_blocks = true;
}
errno = save_errno;
return has_shared_blocks;
}