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.

diff --git a/units/emergency.service.in b/units/emergency.service.in
index ddf7d4cbe2e956d5fe6bca643bdafa39c95f2594..9a81fc4da9c45a508a4bc49c8f51cd956398bf8e 100644 (file)
--- 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 372e8fcd45a86877d1a3d3a50191463e2c0d2441..43981904ea2674608485f0e2adb4d58696e1ba9e 100644 (file)
--- 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