commit 8a9a9bb65a03595ef24582d4601a8c7cedf0219c
author Bowgo Tsai <bowgotsai@google.com> Wed May 03 01:44:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 01:44:41 2017 +0000
tree b003ad37195872609cea8e437d4fff36a8a0d272
parent 048cfbba7e817c309bc034721d701f42a256747f
parent 78095d39fd5d3be2329feb0217f673bdbd29ad50

Merge "init: fix first stage mount failure due to /dev/device-mapper not found" am: 0447a3e5d1 am: ad7c7fe1aa am: fd13c70104
am: ec0d2ce60e

Change-Id: Id5d27476aee25c6019adb4f2ccee9dee580da497

init/init_first_stage.cpp

diff --git a/init/init_first_stage.cpp b/init/init_first_stage.cpp
index 43f1c15..2fa790d 100644
--- a/init/init_first_stage.cpp
+++ b/init/init_first_stage.cpp
@@ -143,8 +143,11 @@
     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;