summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-23 18:42:08 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-23 18:42:08 +0100
commitbe12dd0cb89214b3b0dbffe70dd47d1db2c5d3c2 (patch)
treeea75417d330518f9fa0fd39bd5ec434bd2de2549
parent7ded2e28f2a0e614a3981aeb5b74aaeadf6ad9db (diff)
downloadsystemd-be12dd0cb89214b3b0dbffe70dd47d1db2c5d3c2.tar.gz
rescue: terminate plymouth entirely when going into rescue mode
-rw-r--r--units/emergency.service4
-rw-r--r--units/rescue.service.m42
2 files changed, 3 insertions, 3 deletions
diff --git a/units/emergency.service b/units/emergency.service
index aa3d9856c0..cb28a78385 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 ba29f6e6e6..2a0d3280ec 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