commit 22929da287b8af002ae6270193425f8a4b90692f
author Kelvin Zhang <zhangkelvin@google.com> Thu Mar 17 15:18:36 2022 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Sat Mar 19 00:56:25 2022 -0700
tree 4fcddf5865a472fbd1effa1fbdaa00b233c4f7f3
parent 1821237a1e39754375eb3e7514810c346a83ea66

Copy snapuserd to first_stage_ramdisk

Certain binaries, such as snapuserd, are only available under
/system/bin. To make them accessible by first stage init, we copy
/system/bin/snapuserd to /first_stage_ramdisk/system/bin/snapuserd .

Test: th
Bug: 219841787
Change-Id: I913425a82905c745a05ac32d488f08506dc264ff

init/switch_root.cpp

diff --git a/init/switch_root.cpp b/init/switch_root.cpp
index 575b67f..86fad80 100644
--- a/init/switch_root.cpp
+++ b/init/switch_root.cpp
@@ -78,7 +78,8 @@
         auto new_mount_path = new_root + mount_path;
         mkdir(new_mount_path.c_str(), 0755);
         if (mount(mount_path.c_str(), new_mount_path.c_str(), nullptr, MS_MOVE, nullptr) != 0) {
-            PLOG(FATAL) << "Unable to move mount at '" << mount_path << "'";
+            PLOG(FATAL) << "Unable to move mount at '" << mount_path << "' to "
+                        << "'" << new_mount_path << "'";
         }
     }