picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus-util: print correct warnings for units that fail but for which we have a NULL result only

Browse source
This commit is contained in:
Lennart Poettering 2015-04-28 12:12:29 +02:00
parent a22e1850c3
commit 373a99e489
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/libsystemd/sd-bus/bus-util.c
View file

@ -1758,28 +1758,34 @@ static const struct {
};
static void log_job_error_with_service_result(const char* service, const char *result) {
unsigned i;
_cleanup_free_ char *service_shell_quoted = NULL;
assert(service);
assert(result);
service_shell_quoted = shell_maybe_quote(service);
for (i = 0; i < ELEMENTSOF(explanations); ++i)
if (streq(result, explanations[i].result))
break;
if (!isempty(result)) {
unsigned i;
if (i < ELEMENTSOF(explanations))
log_error("Job for %s failed because %s. See \"systemctl status %s\" and \"journalctl -xe\" for details.\n",
service,
explanations[i].explanation,
strna(service_shell_quoted));
else
log_error("Job for %s failed. See \"systemctl status %s\" and \"journalctl -xe\" for details.\n",
service,
strna(service_shell_quoted));
for (i = 0; i < ELEMENTSOF(explanations); ++i)
if (streq(result, explanations[i].result))
break;
if (i < ELEMENTSOF(explanations)) {
log_error("Job for %s failed because %s. See \"systemctl status %s\" and \"journalctl -xe\" for details.\n",
service,
explanations[i].explanation,
strna(service_shell_quoted));
goto finish;
}
}
log_error("Job for %s failed. See \"systemctl status %s\" and \"journalctl -xe\" for details.\n",
service,
strna(service_shell_quoted));
finish:
/* For some results maybe additional explanation is required */
if (streq_ptr(result, "start-limit"))
log_info("To force a start use \"systemctl reset-failed %1$s\" followed by \"systemctl start %1$s\" again.",