rescue: terminate plymouth entirely when going into rescue mode

diff --git a/units/emergency.service b/units/emergency.service
index aa3d9856c03a3d5596d7f701e56dce452dd66465..cb28a783852a172bbe592a8ed7175b5c7fe669ed 100644 (file)
--- 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 ba29f6e6e6f14b4ed2577b33cedee303c2bcdf48..2a0d3280ecebd729bd57ec0b76886e6cca36c9c7 100644 (file)
--- 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