From: Franck Bui <fbui@suse.com>
Date: Wed, 1 Jun 2016 09:52:35 +0000 (+0200)
Subject: units: wait for plymouth to shut down in rescue.sevice (#3367)
X-Git-Tag: v231~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce3eb7790ca20be6b429d23b26d2d8bd25f71ef9;p=thirdparty%2Fsystemd.git

units: wait for plymouth to shut down in rescue.sevice (#3367)

In the same vein as commit ac59f0c12c117b9bb5b7e17f33987b0107791239 which added
the --wait option to the emergency service, this patch makes sure that plymouth
has exited before entering into the rescue mode.
---

diff --git a/units/rescue.service.in b/units/rescue.service.in
index 92553f61ddf..ecf96bc2110 100644
--- a/units/rescue.service.in
+++ b/units/rescue.service.in
@@ -16,7 +16,7 @@ Before=shutdown.target
 [Service]
 Environment=HOME=/root
 WorkingDirectory=-/root
-ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/bin/plymouth --wait quit
 ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.'
 ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
 Type=idle