init: clean up unused Service[List]::post_data
post_data was used by Userspace Reboot, which was removed.
Bug: 293377020
Test: atest CtsInitTestCases
Change-Id: I1a5bf328f62b8afbe58eef62c64689471e6b018c
diff --git a/init/README.md b/init/README.md
index 0bb26e8..1e15765 100644
--- a/init/README.md
+++ b/init/README.md
@@ -636,7 +636,7 @@
Properties are expanded within _level_.
`mark_post_data`
-> Used to mark the point right after /data is mounted.
+> (This action is deprecated and no-op.)
`mkdir <path> [<mode>] [<owner>] [<group>] [encryption=<action>] [key=<key>]`
> Create a directory at _path_, optionally with the given mode, owner, and
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 1e81692..3f3bec6 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1171,8 +1171,7 @@
}
static Result<void> do_mark_post_data(const BuiltinArguments& args) {
- ServiceList::GetInstance().MarkPostData();
-
+ LOG(INFO) << "deprecated action `mark_post_data` called.";
return {};
}
diff --git a/init/service.cpp b/init/service.cpp
index 31308a0..d76a5d5 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -653,8 +653,6 @@
SetMountNamespace();
}
- post_data_ = ServiceList::GetInstance().IsPostData();
-
LOG(INFO) << "starting service '" << name_ << "'...";
std::vector<Descriptor> descriptors;
diff --git a/init/service.h b/init/service.h
index 5e9af25..ae75553 100644
--- a/init/service.h
+++ b/init/service.h
@@ -144,8 +144,6 @@
std::optional<std::chrono::seconds> timeout_period() const { return timeout_period_; }
const std::vector<std::string>& args() const { return args_; }
bool is_updatable() const { return updatable_; }
- bool is_post_data() const { return post_data_; }
- bool is_from_apex() const { return base::StartsWith(filename_, "/apex/"); }
void set_oneshot(bool value) {
if (value) {
flags_ |= SVC_ONESHOT;
@@ -244,8 +242,6 @@
std::optional<MountNamespace> mount_namespace_;
- bool post_data_ = false;
-
std::optional<std::string> on_failure_reboot_target_;
std::string filename_;
diff --git a/init/service_list.cpp b/init/service_list.cpp
index 1c56e8a..e6cc2c9 100644
--- a/init/service_list.cpp
+++ b/init/service_list.cpp
@@ -68,14 +68,6 @@
}
}
-void ServiceList::MarkPostData() {
- post_data_ = true;
-}
-
-bool ServiceList::IsPostData() {
- return post_data_;
-}
-
void ServiceList::StartDelayedServices() {
for (const auto& name : delayed_service_names_) {
Service* service = FindService(name);
diff --git a/init/service_list.h b/init/service_list.h
index 44e8453..fd7fc05 100644
--- a/init/service_list.h
+++ b/init/service_list.h
@@ -83,19 +83,14 @@
auto end() const { return services_.end(); }
const std::vector<Service*> services_in_shutdown_order() const;
- void MarkPostData();
- bool IsPostData();
void DelayService(const Service& service);
void StartDelayedServices();
- void ResetState() { post_data_ = false; }
-
auto size() const { return services_.size(); }
private:
std::vector<std::unique_ptr<Service>> services_;
- bool post_data_ = false;
std::vector<std::string> delayed_service_names_;
};
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b967831..7b2b96a 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -696,8 +696,6 @@
on post-fs-data
- mark_post_data
-
# Start checkpoint before we touch data
exec - system system -- /system/bin/vdc checkpoint prepareCheckpoint