Skip to content
Permalink
Browse files

ODROID-N2: Avoid sd* vold mounting when booting from sd.

Change-Id: I60d9243c7da93954ade312d7df41efe7b708f7fd
  • Loading branch information...
xiane committed Feb 19, 2019
1 parent 7bd3f50 commit 80de1036e8681b873acf4e0f7100a50108d059a0
Showing with 4 additions and 0 deletions.
  1. +4 −0 main.cpp
@@ -224,6 +224,7 @@ static int process_config(VolumeManager* vm, bool* has_adoptable, bool* has_quot
PLOG(ERROR) << "Failed to open default fstab";
return -1;
}
bool sd_boot = access("/proc/device-tree/emmc@ffe07000/emmc/ignore_mpt", F_OK) == 0;

/* Loop through entries looking for ones that vold manages */
*has_adoptable = false;
@@ -239,6 +240,9 @@ static int process_config(VolumeManager* vm, bool* has_adoptable, bool* has_quot
}

if (fs_mgr_is_voldmanaged(rec)) {
if (sd_boot && (strstr(rec->blk_device, "sd/mmc_host") != NULL))
continue;

if (fs_mgr_is_nonremovable(rec)) {
LOG(WARNING) << "nonremovable no longer supported; ignoring volume";
continue;

0 comments on commit 80de103

Please sign in to comment.
You can’t perform that action at this time.