From 202064b314e23f36698819dc49e0a4ec318a6fd382c978bf02b46b619e9b6cb7 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 15 Apr 2014 11:25:54 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=595
---
 rescue-emergency-target-conflicts.patch | 20 ++++++++++++++++++++
 systemd-mini.spec                       |  3 +++
 systemd.spec                            |  3 +++
 3 files changed, 26 insertions(+)
 create mode 100644 rescue-emergency-target-conflicts.patch

diff --git a/rescue-emergency-target-conflicts.patch b/rescue-emergency-target-conflicts.patch
new file mode 100644
index 0000000..f4f1598
--- /dev/null
+++ b/rescue-emergency-target-conflicts.patch
@@ -0,0 +1,20 @@
+--- systemd-210/units/emergency.target
++++ systemd-210/units/emergency.target	2014-04-15 11:11:18.618235831 +0000
+@@ -10,4 +10,5 @@ Description=Emergency Mode
+ Documentation=man:systemd.special(7)
+ Requires=emergency.service
+ After=emergency.service
++Conflicts=getty.target rescue.target
+ AllowIsolate=yes
+--- systemd-210/units/rescue.target
++++ systemd-210/units/rescue.target	2014-04-15 11:14:40.606808928 +0000
+@@ -10,7 +10,8 @@ Description=Rescue Mode
+ Documentation=man:systemd.special(7)
+ Requires=sysinit.target rescue.service
+ After=sysinit.target rescue.service
+-Conflicts=getty.target
++Conflicts=getty.target emergency.target
++Before=emergency.target
+ AllowIsolate=yes
+ 
+ [Install]
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 99cc247..e34d1fc 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -382,6 +382,8 @@ Patch194:       0007-dbus-suppress-duplicate-and-misleading-messages.patch
 Patch195:       0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
 # PATCH-FIX-SUSE Detect XEN dom0 as well as domU
 Patch196:       systemd-detect-xendom.patch
+# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console
+Patch197:       rescue-emergency-target-conflicts.patch
 
 # UDEV PATCHES
 # ============
@@ -746,6 +748,7 @@ cp %{SOURCE7} m4/
 %patch194 -p0
 %patch195 -p0
 %patch196 -p1
+%patch197 -p1
 
 # udev patches
 %patch1001 -p1
diff --git a/systemd.spec b/systemd.spec
index 630d28b..7d307c9 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -377,6 +377,8 @@ Patch194:       0007-dbus-suppress-duplicate-and-misleading-messages.patch
 Patch195:       0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
 # PATCH-FIX-SUSE Detect XEN dom0 as well as domU
 Patch196:       systemd-detect-xendom.patch
+# PATCH-FIX-SUSE Avoid that emergency and rescue sulogin are fighting on console
+Patch197:       rescue-emergency-target-conflicts.patch
 
 # UDEV PATCHES
 # ============
@@ -741,6 +743,7 @@ cp %{SOURCE7} m4/
 %patch194 -p0
 %patch195 -p0
 %patch196 -p1
+%patch197 -p1
 
 # udev patches
 %patch1001 -p1