commit 0447a3e5d1591b0a232106534ca0463bac5346dc
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 03 01:33:07 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 03 01:33:07 2017 +0000
tree a051037cf004d7acb85bef2fa637d8f0c9c7c36f
parent dd6e73f432b78bdcba813d6f7ab3b3d18389418f
parent ea5fca4cd06006e99695c8372be0a58302314651

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

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;