unit: continue boot when exiting emergency/resuce shell

diff --git a/fixme b/fixme
index c4582d3d0b9f948b71756f0198c1fd7a58fb1e96..6619940aeabe8a5df0a1c6a5caacd2bcf72e27f0 100644 (file)
--- a/fixme
+++ b/fixme
@@ -1,7 +1,5 @@
 v11:
 
 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:
 * verify ordering of random-seed-load and base.target!
 
 later:

diff --git a/units/emergency.service b/units/emergency.service
index 8578654d88611b6e68da3393c58919dd39c5a80a..5910ec9b9108bedc5553dc9fe9397ece8d686c66 100644 (file)
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -15,11 +15,10 @@ DefaultDependencies=no
 Environment=HOME=/root
 WorkingDirectory=/root
 ExecStartPre=-/bin/plymouth --hide-splash
 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
 ExecStart=-/sbin/sulogin

+ExecStopPost=/bin/systemctl default

 StandardInput=tty-force
 StandardInput=tty-force

-Restart=always
-RestartSec=0

 KillMode=process-group
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 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 a519ae3d6304d9a87c6ea9f0f270188988f064b1..550df1ef6099dd88e2a1b0afce5d0a66b309ec41 100644 (file)
--- a/units/fedora/single.service
+++ b/units/fedora/single.service
@@ -16,13 +16,13 @@ Before=multi-user.target
 
 [Service]
 Environment=HOME=/root
 
 [Service]
 Environment=HOME=/root

+EnvironmentFile=/etc/sysconfig/init

 WorkingDirectory=/root
 ExecStartPre=-/bin/plymouth --hide-splash
 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
 StandardInput=tty-force

-Restart=always
-RestartSec=0

 KillMode=process-group
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 KillMode=process-group
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash