init: fix DumpState() logging
Fix two formatting issues in Action::DumpState(),
Old:
on ro.crypto.state=encrypted ro.crypto.type=file zygote-start
New:
on ro.crypto.state=encrypted && ro.crypto.type=file && zygote-start
Old:
on boot
%sifup lo
%shostname localhost
%sdomainname localdomain
%swrite /proc/sys/vm/overcommit_memory 1
New:
on boot
ifup lo
hostname localhost
domainname localdomain
write /proc/sys/vm/overcommit_memory 1
Also, now that we're importing many small rc files, it no longer makes
sense to call Parser::DumpState() after each import. Therefore, move
the conditional to call Parser::DumpState() to after /init.rc and its
imports are parsed and after the late imports are parsed.
Test: Boot bullhead with DumpState() enabled and check the output
Change-Id: I0b81305b8938aa1a7133d7dd2055f34f47609cf9
diff --git a/init/action.cpp b/init/action.cpp
index 09de81a..1bba0f2 100644
--- a/init/action.cpp
+++ b/init/action.cpp
@@ -246,20 +246,16 @@
}
std::string Action::BuildTriggersString() const {
- std::string result;
+ std::vector<std::string> triggers;
for (const auto& [trigger_name, trigger_value] : property_triggers_) {
- result += trigger_name;
- result += '=';
- result += trigger_value;
- result += ' ';
+ triggers.emplace_back(trigger_name + '=' + trigger_value);
}
if (!event_trigger_.empty()) {
- result += event_trigger_;
- result += ' ';
+ triggers.emplace_back(event_trigger_);
}
- result.pop_back();
- return result;
+
+ return Join(triggers, " && ");
}
void Action::DumpState() const {
@@ -268,7 +264,7 @@
for (const auto& c : commands_) {
std::string cmd_str = c.BuildCommandString();
- LOG(INFO) << " %s" << cmd_str;
+ LOG(INFO) << " " << cmd_str;
}
}