commit a31834a4b633e60462dd6d8ad85019a1517e7f15
author David Anderson <dvander@google.com> Wed Feb 26 17:56:03 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 26 17:56:03 2020 +0000
tree 9220200e9f9dd85606aebe9c97be00956b6c7787
parent 7ef2b1d8532b1df7aeb5494b277dc5345c2df2da
parent c991f347b267b41ef76e19c82000a98cefc65291

Merge "init: Make sure ImageManager status files are labelled."

init/selinux.cpp

diff --git a/init/selinux.cpp b/init/selinux.cpp
index c5b7576..2faa167 100644
--- a/init/selinux.cpp
+++ b/init/selinux.cpp
@@ -535,7 +535,9 @@
 
     selinux_android_restorecon("/linkerconfig", 0);
 
-    selinux_android_restorecon(gsi::kDsuAvbKeyDir, SELINUX_ANDROID_RESTORECON_RECURSE);
+    // adb remount, snapshot-based updates, and DSUs all create files during
+    // first-stage init.
+    selinux_android_restorecon("/metadata", SELINUX_ANDROID_RESTORECON_RECURSE);
 }
 
 int SelinuxKlogCallback(int type, const char* fmt, ...) {