commit cb4c7d56e81f794c66e6436ba1846247408e9700
author Inseob Kim <inseob@google.com> Wed Nov 09 09:57:09 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 09 09:57:09 2022 +0000
tree b703dd987d7a7555e22d5c3e8a7399dc4541001f
parent 2a501a11dc100b7641e54bb95016e4a23e6fdae1
parent 0fbc1d7e3164ddf06899cf01a4538176bb4a9d90

Merge "Don't unmount APEXes in microdroid"

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 4c27a56..1f4186d 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -567,6 +567,11 @@
 }
 
 static Result<void> UnmountAllApexes() {
+    // don't need to unmount because apexd doesn't use /data in Microdroid
+    if (IsMicrodroid()) {
+        return {};
+    }
+
     const char* args[] = {"/system/bin/apexd", "--unmount-all"};
     int status;
     if (logwrap_fork_execvp(arraysize(args), args, &status, false, LOG_KLOG, true, nullptr) != 0) {