diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-04-27 10:34:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-27 10:34:24 +0200 |
| commit | 3136ec90adf6d797eb2ac756f52313581124f38e (patch) | |
| tree | 36a6313fd51c6e12e5cdbdc9bf0dc0501d618bd7 /units/emergency.service.in | |
| parent | Correctly parse OBJECT_PID in journald messages (#3129) (diff) | |
| download | systemd-3136ec90adf6d797eb2ac756f52313581124f38e.tar.xz systemd-3136ec90adf6d797eb2ac756f52313581124f38e.zip | |
Stop syslog.socket when entering emergency mode (#3130)
When enabling ForwardToSyslog=yes, the syslog.socket is active when entering
emergency mode. Any log message then triggers the start of rsyslog.service (or
other implementation) along with its dependencies such as local-fs.target and
sysinit.target. As these might fail themselves (e. g. faulty /etc/fstab), this
breaks the emergency mode.
This causes syslog.socket to fail with "Failed to queue service startup job:
Transition is destructive".
Add Conflicts=syslog.socket to emergency.service to make sure the socket is
stopped when emergency.service is started.
Fixes #266
Diffstat (limited to 'units/emergency.service.in')
| -rw-r--r-- | units/emergency.service.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/units/emergency.service.in b/units/emergency.service.in index fb390eacfe..0de16f24e8 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -11,6 +11,7 @@ Documentation=man:sulogin(8) DefaultDependencies=no Conflicts=shutdown.target Conflicts=rescue.service +Conflicts=syslog.socket Before=shutdown.target [Service] |