Merge "Reland: "init: run property service in a thread""

1 files changed, 10 insertions, 0 deletions

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 7c66de5f8..8c4d9898d 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -80,6 +80,7 @@
 using namespace std::literals::string_literals;
 
 using android::base::Basename;
+using android::base::StartsWith;
 using android::base::unique_fd;
 using android::fs_mgr::Fstab;
 using android::fs_mgr::ReadFstabFromFile;
@@ -700,6 +701,15 @@ static Result<void> do_swapon_all(const BuiltinArguments& args) {
 }
 
 static Result<void> do_setprop(const BuiltinArguments& args) {
+    if (StartsWith(args[1], "ctl.")) {
+        return Error() << "InitPropertySet: Do not set ctl. properties from init; call the Service "
+                          "functions directly";
+    }
+    if (args[1] == kRestoreconProperty) {
+        return Error() << "InitPropertySet: Do not set '" << kRestoreconProperty
+                       << "' from init; use the restorecon builtin directly";
+    }
+
     property_set(args[1], args[2]);
     return {};
 }