summaryrefslogtreecommitdiffstats
path: root/units/emergency.service.in
diff options
context:
space:
mode:
authorAlan Jenkins <alan.christopher.jenkins@gmail.com>2017-09-25 12:45:03 +0200
committerAlan Jenkins <alan.christopher.jenkins@gmail.com>2017-09-29 18:35:44 +0200
commit6f6d1a8a6abae490e14e6a448895e36c6cefdefc (patch)
tree302fe29d8130c398c786be9b681c7e35a2c37a46 /units/emergency.service.in
parentunits: express Conflict in syslog.socket instead of emergency.service (diff)
downloadsystemd-6f6d1a8a6abae490e14e6a448895e36c6cefdefc.tar.xz
systemd-6f6d1a8a6abae490e14e6a448895e36c6cefdefc.zip
units: add missing ordering deps for Conflicts= of emergency.service
1. If we exited emergency mode immediately, we don't want to have an irreversible stop job still running for syslog.socket. I _suspect_ that can't happen, but let's not waste effort working out exactly why it's impossible and not just very improbable. 2. Similarly, it seems undesirable to have rescue.service and emergency.service both running with an open FD of /dev/console, for however short a period.
Diffstat (limited to 'units/emergency.service.in')
-rw-r--r--units/emergency.service.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/units/emergency.service.in b/units/emergency.service.in
index ddf7d4cbe2..9a81fc4da9 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -12,6 +12,7 @@ DefaultDependencies=no
Conflicts=shutdown.target
Conflicts=rescue.service
Before=shutdown.target
+Before=rescue.service
[Service]
Environment=HOME=/root