summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-13 17:10:12 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-20 22:38:23 -0500
commitef417cfd2211ae017a38b9796c6db29130133e63 (patch)
treea633270db3f254af3dfe738b1080b7b3b3e969f1
parent0ef61cec618391593a410ef3ce277071d559edb0 (diff)
manager: be more precise in message about restart
-rw-r--r--TODO7
-rw-r--r--src/core/service.c5
2 files changed, 9 insertions, 3 deletions
diff --git a/TODO b/TODO
index b87ed1726c..e1d2126a25 100644
--- a/TODO
+++ b/TODO
@@ -72,8 +72,11 @@ Features:
desktop UIs such as gnome-shell to freeze apps that are not visible
on screen, not unlike how job control works on the shell
-* machinectl bash completion is missing
-* busctl bash and zsh completions are outdated
+* completions:
+ - busctl zsh completion is outdated
+ - systemd-nspawn -Z/-L/-q is missing for zsh
+ - systemd-nspawn completion is missing for bash
+ - manager property enumeration was broken when systemd moved to /usr/lib/
* cgroups:
- implement system-wide DefaultCPUAccounting=1 switch (and similar for blockio, memory?)
diff --git a/src/core/service.c b/src/core/service.c
index d8e88ea2f0..ca71788d22 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3308,7 +3308,10 @@ static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us
case SERVICE_AUTO_RESTART:
log_info_unit(UNIT(s)->id,
- "%s holdoff time over, scheduling restart.", UNIT(s)->id);
+ s->restart_usec > 0 ?
+ "%s holdoff time over, scheduling restart." :
+ "%s has no holdoff time, scheduling restart.",
+ UNIT(s)->id);
service_enter_restart(s);
break;