33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From efe9f80f5e99abdddad320e8771da236eada169f Mon Sep 17 00:00:00 2001
|
|
From: Martin Pitt <martin.pitt@ubuntu.com>
|
|
Date: Thu, 9 Jul 2015 16:25:00 +0200
|
|
Subject: [PATCH 08/47] 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
|
|
---
|
|
units/emergency.service.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/units/emergency.service.in b/units/emergency.service.in
|
|
index 52b9b1c..8dc3cbd 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
|
|
--
|
|
2.5.0
|
|
|