Commit c5c03759 authored by Michael Biebl's avatar Michael Biebl
Browse files

Make emergency.service conflict with rescue.service

Otherwise if rescue mode is selected during boot and the emergency mode
is triggered (e.g. via a broken fstab entry), we have two sulogin
processes fighting over the tty.

Closes: #757072
parent 6cf949fc
......@@ -21,6 +21,10 @@ systemd (208-8) UNRELEASED; urgency=medium
(Closes: #757777)
* Updated upstream v208-stable patch series to 53b1b6c.
* Cherry-pick upstream fix to ignore temporary dpkg files. (Closes: #757302)
* Make emergency.service conflict with rescue.service.
Otherwise if rescue mode is selected during boot and the emergency mode
is triggered (e.g. via a broken fstab entry), we have two sulogin
processes fighting over the tty. (Closes: #757072)
-- Martin Pitt <mpitt@debian.org> Thu, 07 Aug 2014 08:31:38 +0200
......
From: Michael Biebl <biebl@debian.org>
Date: Wed, 20 Aug 2014 23:44:36 +0200
Subject: Make emergency.service conflict with rescue.service
Otherwise if rescue mode is selected during boot and the emergency mode
is triggered (e.g. via a broken fstab entry), we have two sulogin
processes fighting over the tty.
Closes: #757072
Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=82778
---
units/emergency.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/units/emergency.service.in b/units/emergency.service.in
index 91fc1bb..224a434 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -10,6 +10,7 @@ Description=Emergency Shell
Documentation=man:sulogin(8)
DefaultDependencies=no
Conflicts=shutdown.target
+Conflicts=rescue.service
Before=shutdown.target
[Service]
......@@ -570,3 +570,4 @@ Adjust-systemd-user-pam-config-file-for-Debian.patch
Add-run-initctl-support-to-SysV-compat-tools.patch
Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
Add-support-for-TuxOnIce-hibernation.patch
Make-emergency.service-conflict-with-rescue.service.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment