summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2015-07-09 16:25:00 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2015-07-10 05:43:52 +0200
commitac59f0c12c117b9bb5b7e17f33987b0107791239 (patch)
treefc0da293f41fae3f2a2dca4ccc2cf202f5286212
parent43694a8cc70667498f3ffc5d9325b7d0428558e5 (diff)
units: emergency.service: wait for plymouth to shut down
Merely calling "plymouth quit" isn't sufficient, as plymouth needs some time to shut down. This needs plymouth --wait (which is a no-op when it's not running). Fixes invisible emergency shell with plymouth running endlessly. https://launchpad.net/bugs/1471258
-rw-r--r--units/emergency.service.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/units/emergency.service.in b/units/emergency.service.in
index 52b9b1cd03..8dc3cbdede 100644
--- a/units/emergency.service.in
+++ b/units/emergency.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 emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.'
ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
Type=idle