client: do not wait forever if daemon is not started

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@gmail.com>

diff --git a/src/client/plymouth.c b/src/client/plymouth.c
index 462ec25aa56aaaf89d5c639394462aab04ca7696..84fe6e30c6c55a79e6eba64eee3130426a2c12a7 100644 (file)
--- 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);