summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-bus
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-04-11 19:39:30 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-04-12 10:20:36 -0400
commita61cc460e87f00f30ae5ab5097565a264247487c (patch)
tree90c96a9d1f3f4dc04f22aed9352a64a460cf6afc /src/libsystemd/sd-bus
parentf8bc41822ba19905707a97f9d87262f2c2b6e5fa (diff)
bus-util: add articles to explanation messages
We are talking about one member of a group of things (resource limits, signals, timeouts), without specifying which one. An indenfinite article is in order. When we are talking about the control process, it's a specific one, so the definite article is used.
Diffstat (limited to 'src/libsystemd/sd-bus')
-rw-r--r--src/libsystemd/sd-bus/bus-util.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
index abb48290e3..ed366145d9 100644
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -1733,13 +1733,13 @@ static int bus_job_get_service_result(BusWaitForJobs *d, char **result) {
static const struct {
const char *result, *explanation;
} explanations [] = {
- { "resources", "configured resource limit was exceeded" },
- { "timeout", "timeout was exceeded" },
- { "exit-code", "control process exited with error code" },
- { "signal", "fatal signal was delivered to the control process" },
- { "core-dump", "fatal signal was delivered to the control process. Core dumped" },
- { "watchdog", "service failed to send watchdog ping" },
- { "start-limit", "start of the service was attempted too often too quickly" }
+ { "resources", "a configured resource limit was exceeded" },
+ { "timeout", "a timeout was exceeded" },
+ { "exit-code", "the control process exited with error code" },
+ { "signal", "a fatal signal was delivered to the control process" },
+ { "core-dump", "a fatal signal was delivered causing the control process to dump core" },
+ { "watchdog", "the service failed to send watchdog ping" },
+ { "start-limit", "start of the service was attempted too often" }
};
static void log_job_error_with_service_result(const char* service, const char *result) {
@@ -1767,8 +1767,7 @@ static void log_job_error_with_service_result(const char* service, const char *r
/* For some results maybe additional explanation is required */
if (streq_ptr(result, "start-limit"))
- log_info("To force a start please invoke \"systemctl reset-failed %s\" followed by \"systemctl start %s\" again.",
- strna(service_shell_quoted),
+ log_info("To force a start use \"systemctl reset-failed %1$s\" followed by \"systemctl start %1$s\" again.",
strna(service_shell_quoted));
}