unit: continue boot when exiting emergency/resuce shell

This commit is contained in:
Lennart Poettering 2010-10-06 02:43:06 +02:00
parent 71fad67514
commit 273f54cdc2
3 changed files with 6 additions and 9 deletions

2
fixme
View File

@ -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:

View File

@ -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

View File

@ -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