summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-11 11:39:59 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-11 11:39:59 +0200
commit7020e8be3f0e207ceacc8b3c8c0b1f6c99597ea8 (patch)
treeea95eb73cc16a0b42cafb2f1a9fc867009389119
parent2f198e2f36a4acc05171cc2169bc58887c42d350 (diff)
reword a few log messages
-rw-r--r--src/main.c2
-rw-r--r--src/service.c14
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main.c b/src/main.c
index 5360455912..d2411447f7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -284,7 +284,7 @@ static int parse_proc_cmdline_word(const char *word) {
log_warning("Unknown kernel switch %s. Ignoring.", word);
log_info("Supported kernel switches:");
- log_info("systemd.default=UNIT Default unit to start");
+ log_info("systemd.default_unit=UNIT Default unit to start");
log_info("systemd.log_target=console|kmsg|syslog Log target");
log_info("systemd.log_level=LEVEL Log level");
log_info("systemd.dump_core=0|1 Dump core on crash");
diff --git a/src/service.c b/src/service.c
index 651f7c82ca..e1975eb119 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1377,7 +1377,7 @@ static void service_enter_stop_post(Service *s, bool success) {
return;
fail:
- log_warning("%s failed to run stop-post executable: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run 'stop-post' task: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
}
@@ -1473,7 +1473,7 @@ static void service_enter_stop(Service *s, bool success) {
return;
fail:
- log_warning("%s failed to run stop executable: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run 'stop' task: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
}
@@ -1518,7 +1518,7 @@ static void service_enter_start_post(Service *s) {
return;
fail:
- log_warning("%s failed to run start-post executable: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run 'start-post' task: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_stop(s, false);
}
@@ -1584,7 +1584,7 @@ static void service_enter_start(Service *s) {
return;
fail:
- log_warning("%s failed to run start exectuable: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run 'start' task: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
}
@@ -1613,7 +1613,7 @@ static void service_enter_start_pre(Service *s) {
return;
fail:
- log_warning("%s failed to run start-pre executable: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run 'start-pre' task: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_dead(s, false, true);
}
@@ -1660,7 +1660,7 @@ static void service_enter_reload(Service *s) {
return;
fail:
- log_warning("%s failed to run reload executable: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run 'reload' task: %s", UNIT(s)->meta.id, strerror(-r));
service_enter_stop(s, false);
}
@@ -1690,7 +1690,7 @@ static void service_run_next(Service *s, bool success) {
return;
fail:
- log_warning("%s failed to run spawn next executable: %s", UNIT(s)->meta.id, strerror(-r));
+ log_warning("%s failed to run spawn next task: %s", UNIT(s)->meta.id, strerror(-r));
if (s->state == SERVICE_START_PRE)
service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);