Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6737a6bf authored Aug 05, 2019 by Tom Cherry

init: Check onrestart commands

Test: have bad users/groups in onrestart chown commands fail the build
Change-Id: Ic7fea6395c1f6e09f06800ba373d402a81cb774c

parent 23a87716

init/host_init_verifier.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -239,7 +239,7 @@ int main(int argc, char** argv) {
		LOG(ERROR) << "Failed to open init rc script '" << *argv << "'";
		return EXIT_FAILURE;
		}
		size_t failures = parser.parse_error_count() + am.CheckAllCommands();
		size_t failures = parser.parse_error_count() + am.CheckAllCommands() + sl.CheckAllCommands();
		if (failures > 0) {
		LOG(ERROR) << "Failed to parse init script '" << *argv << "' with " << failures
		<< " errors";

init/service.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ class Service {
		void AddReapCallback(std::function<void(const siginfo_t& siginfo)> callback) {
		reap_callbacks_.emplace_back(std::move(callback));
		}
		size_t CheckAllCommands() const { return onrestart_.CheckAllCommands(); }

		static bool is_exec_service_running() { return is_exec_service_running_; }

init/service_list.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,14 @@ ServiceList& ServiceList::GetInstance() {
		return instance;
		}

		size_t ServiceList::CheckAllCommands() {
		size_t failures = 0;
		for (const auto& service : services_) {
		failures += service->CheckAllCommands();
		}
		return failures;
		}

		void ServiceList::AddService(std::unique_ptr<Service> service) {
		services_.emplace_back(std::move(service));
		}

init/service_list.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ class ServiceList {

		// Exposed for testing
		ServiceList();
		size_t CheckAllCommands();

		void AddService(std::unique_ptr<Service> service);
		void RemoveService(const Service& svc);