summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-04-27 10:34:24 +0200
committerLennart Poettering <lennart@poettering.net>2016-04-27 10:34:24 +0200
commit3136ec90adf6d797eb2ac756f52313581124f38e (patch)
tree36a6313fd51c6e12e5cdbdc9bf0dc0501d618bd7 /units
parentdaf535a3829121155683e63e729093347b691a3e (diff)
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')
-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 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]