manager: be more precise in message about restart

diff --git a/TODO b/TODO
index b87ed1726c321684d6cc6bb65719496146531bbe..e1d2126a25ea7c7c673fe8bb7f60d444f7fef98e 100644 (file)
--- 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 d8e88ea2f0960e0a08961844d7e2ea450eec628a..ca71788d220a55b40349025b65298237a7bb57a7 100644 (file)
--- 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;