[systemd-devel] [PATCH] client: do not wait forever if daemon is not started

[Andrey Borzenkov]

Currently plymouth --wait will wait forever if daemon is not
started. This does not look right - we were asked to wait for
daemon to stop and daemon is obviously stopped. So make it
exit right away in this case.

This avoids timeouts during systemd boot if plymouth happened to be
stopped (or never started) before plymouth-quit-wait had chance to start.

Signed-off-by: Andrey Borzenkov <arvidjaar at gmail.com>

---
 src/client/plymouth.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/client/plymouth.c b/src/client/plymouth.c
index 462ec25..97e6b3f 100644
--- a/src/client/plymouth.c
+++ b/src/client/plymouth.c
@@ -1103,6 +1103,11 @@ main (int    argc,
           ply_trace ("has active vt? failed");
           return 1;
         }
+      if (should_wait)
+        {
+          ply_trace ("no need to wait");
+          return 0;
+        }
     }
 
   ply_boot_client_attach_to_event_loop (state.client, state.loop);
-- 
tg: (b6b10b1..) upstream/quit-wait (depends on: origin/master)