tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fs_mgr: Allow remounts with Magisk installed

Browse source 
This allows remount to gracefully mount /system when Magisk
is installed.

As a sidenote, the ro.debuggable property check can safely
be removed due to the simple fact that CPP preprocessor flag
ALLOW_ADBD_DISABLE_VERITY=1 is passed when building
userdebug/eng.

Change-Id: Ic10eccbf5d225468c3dc42f8ae3ae7c05b49a699
This commit is contained in:
Bruno Martins 2020-04-19 16:28:53 +01:00 committed by zlewchan
parent a54364dc92
commit 85a30f4c86
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/fs_mgr_remount.cpp
View file

@ -374,7 +374,8 @@ bool RemountPartition(Fstab& fstab, Fstab& mounts, FstabEntry& entry) {
fs_mgr_set_blk_ro(blk_device, false);
// Find system-as-root mount point?
if ((mount_point == "/system") && !GetEntryForMountPoint(&mounts, mount_point) &&
if ((mount_point == "/system" || mount_point == "/system_root") &&
!GetEntryForMountPoint(&mounts, mount_point) &&
GetEntryForMountPoint(&mounts, "/")) {
mount_point = "/";
}
@ -629,7 +630,7 @@ int main(int argc, char* argv[]) {
// If somehow this executable is delivered on a "user" build, it can
// not function, so providing a clear message to the caller rather than
// letting if fall through and provide a lot of confusing failure messages.
if (!ALLOW_ADBD_DISABLE_VERITY || !android::base::GetBoolProperty("ro.debuggable", false)) {
if (!ALLOW_ADBD_DISABLE_VERITY) {
LOG(ERROR) << "Device must be userdebug build";
return EXIT_FAILURE;
}