From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Oct 2010 00:43:06 +0000 (+0200)
Subject: unit: continue boot when exiting emergency/resuce shell
X-Git-Tag: v11~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=273f54cdc2ce9eec741157c60fa240a23d79bb72

unit: continue boot when exiting emergency/resuce shell
---

diff --git a/fixme b/fixme
index c4582d3d0..6619940ae 100644
--- a/fixme
+++ b/fixme
@@ -1,7 +1,5 @@
 v11:
 
-* emergency.service should start default.target after C-d. synchronize from fedora's initscripts package
-
 * verify ordering of random-seed-load and base.target!
 
 later:
diff --git a/units/emergency.service b/units/emergency.service
index 8578654d8..5910ec9b9 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -15,11 +15,10 @@ DefaultDependencies=no
 Environment=HOME=/root
 WorkingDirectory=/root
 ExecStartPre=-/bin/plymouth --hide-splash
-ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
+ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
 ExecStart=-/sbin/sulogin
+ExecStopPost=/bin/systemctl default
 StandardInput=tty-force
-Restart=always
-RestartSec=0
 KillMode=process-group
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
diff --git a/units/fedora/single.service b/units/fedora/single.service
index a519ae3d6..550df1ef6 100644
--- a/units/fedora/single.service
+++ b/units/fedora/single.service
@@ -16,13 +16,13 @@ Before=multi-user.target
 
 [Service]
 Environment=HOME=/root
+EnvironmentFile=/etc/sysconfig/init
 WorkingDirectory=/root
 ExecStartPre=-/bin/plymouth --hide-splash
-ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" to activate default mode.'
-ExecStart=-/sbin/sulogin
+ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D to activate default mode.'
+ExecStart=-/bin/bash -c "exec $SINGLE"
+ExecStopPost=/bin/systemctl default
 StandardInput=tty-force
-Restart=always
-RestartSec=0
 KillMode=process-group
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash