Merge "init: fix first stage mount failure due to /dev/device-mapper not found"

am: 0447a3e5d1

Change-Id: Ie0ad21fc28ea7a692ef7b3dfbb663e8f6f3dfe93
This commit is contained in:
Bowgo Tsai 2017-05-03 01:36:11 +00:00 committed by android-build-merger
commit ad7c7fe1aa

View file

@ -143,8 +143,11 @@ bool FirstStageMount::InitDevices() {
if (!GetRequiredDevices(&devices_partition_names, &need_dm_verity)) return false;
if (need_dm_verity) {
device_init("/sys/devices/virtual/misc/device-mapper",
[&](uevent* uevent) -> coldboot_action_t { return COLDBOOT_STOP; });
const std::string dm_path = "/devices/virtual/misc/device-mapper";
device_init(("/sys" + dm_path).c_str(), [&dm_path](uevent* uevent) -> coldboot_action_t {
if (uevent->path == dm_path) return COLDBOOT_STOP;
return COLDBOOT_CONTINUE; // dm_path not found, continue to find it.
});
}
bool success = false;