diff options
| author | Alan Jenkins <alan.christopher.jenkins@gmail.com> | 2017-09-25 11:45:03 +0100 |
|---|---|---|
| committer | Alan Jenkins <alan.christopher.jenkins@gmail.com> | 2017-09-29 17:35:44 +0100 |
| commit | 6f6d1a8a6abae490e14e6a448895e36c6cefdefc (patch) | |
| tree | 302fe29d8130c398c786be9b681c7e35a2c37a46 /units | |
| parent | 950d8fcdd9aa7e71ad32ea224e7d6fbe0f9f53de (diff) | |
| download | systemd-6f6d1a8a6abae490e14e6a448895e36c6cefdefc.tar.gz | |
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')
| -rw-r--r-- | units/emergency.service.in | 1 | ||||
| -rw-r--r-- | units/syslog.socket | 1 |
2 files changed, 2 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 diff --git a/units/syslog.socket b/units/syslog.socket index 372e8fcd45..43981904ea 100644 --- a/units/syslog.socket +++ b/units/syslog.socket @@ -18,6 +18,7 @@ Before=shutdown.target # Don't try to activate syslog.service if sysinit.target has failed. Conflicts=emergency.service +Before=emergency.service [Socket] ListenDatagram=/run/systemd/journal/syslog |