From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 23 Feb 2011 17:42:08 +0000 (+0100)
Subject: rescue: terminate plymouth entirely when going into rescue mode
X-Git-Tag: v19~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=be12dd0cb89214b3b0dbffe70dd47d1db2c5d3c2

rescue: terminate plymouth entirely when going into rescue mode
---

diff --git a/units/emergency.service b/units/emergency.service
index aa3d9856c..cb28a7838 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -16,10 +16,10 @@ Before=shutdown.target
 [Service]
 Environment=HOME=/root
 WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth --hide-splash
+ExecStartPre=-/bin/plymouth quit
 ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
 ExecStart=-/sbin/sulogin
-ExecStopPost=/bin/systemctl default
+ExecStopPost=/bin/systemctl --fail default
 StandardInput=tty-force
 KillMode=process-group
 
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index ba29f6e6e..2a0d3280e 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -17,7 +17,7 @@ Before=shutdown.target
 [Service]
 Environment=HOME=/root
 WorkingDirectory=/root
-ExecStartPre=-/bin/plymouth --hide-splash
+ExecStartPre=-/bin/plymouth quit
 ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to activate default mode.'
 m4_ifdef(`TARGET_FEDORA',
 `EnvironmentFile=/etc/sysconfig/init