From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 13 Apr 2011 21:29:51 +0000 (+0200)
Subject: units: add --no-block when starting normal service after shell exited
X-Git-Tag: v25~52
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7f62e3774c08a9c14d9f69de1ae8830e94f8f1ec;ds=sidebyside

units: add --no-block when starting normal service after shell exited
---

diff --git a/units/emergency.service b/units/emergency.service
index a97ec5e38..eff526186 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -19,7 +19,7 @@ WorkingDirectory=/root
 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 --fail default
+ExecStopPost=/bin/systemctl --fail --no-block default
 StandardInput=tty-force
 KillMode=process
 
diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
index 241c75071..b48d08502 100644
--- a/units/rescue.service.m4
+++ b/units/rescue.service.m4
@@ -26,7 +26,7 @@ m4_ifdef(`TARGET_MANDRIVA',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
 `ExecStart=-/sbin/sulogin'))
-ExecStopPost=-/bin/systemctl --fail default
+ExecStopPost=-/bin/systemctl --fail --no-block default
 StandardInput=tty-force
 KillMode=process