summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fixme2
-rw-r--r--units/emergency.service5
-rw-r--r--units/fedora/single.service8
3 files changed, 6 insertions, 9 deletions
diff --git a/fixme b/fixme
index c4582d3d0b..6619940aea 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 8578654d88..5910ec9b91 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 a519ae3d63..550df1ef60 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