From c5c03759dba3e20c8c82a532c95eebe7056e54bd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Aug 2014 23:49:50 +0200 Subject: [PATCH] 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 --- debian/changelog | 4 +++ ...service-conflict-with-rescue.service.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/Make-emergency.service-conflict-with-rescue.service.patch diff --git a/debian/changelog b/debian/changelog index 12599c681..27feabda7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 07 Aug 2014 08:31:38 +0200 diff --git a/debian/patches/Make-emergency.service-conflict-with-rescue.service.patch b/debian/patches/Make-emergency.service-conflict-with-rescue.service.patch new file mode 100644 index 000000000..2f93097a1 --- /dev/null +++ b/debian/patches/Make-emergency.service-conflict-with-rescue.service.patch @@ -0,0 +1,26 @@ +From: Michael Biebl +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] diff --git a/debian/patches/series b/debian/patches/series index b383d0ba4..b2153e91e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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