diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-10-06 02:43:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-06 02:44:15 +0200 |
| commit | 273f54cdc2ce9eec741157c60fa240a23d79bb72 (patch) | |
| tree | 1e9fc4565088fcad888b34d7ebd933ff8abc9d16 | |
| parent | 71fad6751434f06485a744d41be2d807303c1184 (diff) | |
unit: continue boot when exiting emergency/resuce shell
| -rw-r--r-- | fixme | 2 | ||||
| -rw-r--r-- | units/emergency.service | 5 | ||||
| -rw-r--r-- | units/fedora/single.service | 8 |
3 files changed, 6 insertions, 9 deletions
@@ -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 |