Dr. Werner Fink 2014-04-15 11:25:54 +00:00 committed by Git OBS Bridge
parent 1a4b394f2e
commit 202064b314
3 changed files with 26 additions and 0 deletions

View File

@ -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]

View File

@ -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 Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
# PATCH-FIX-SUSE Detect XEN dom0 as well as domU # PATCH-FIX-SUSE Detect XEN dom0 as well as domU
Patch196: systemd-detect-xendom.patch 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 # UDEV PATCHES
# ============ # ============
@ -746,6 +748,7 @@ cp %{SOURCE7} m4/
%patch194 -p0 %patch194 -p0
%patch195 -p0 %patch195 -p0
%patch196 -p1 %patch196 -p1
%patch197 -p1
# udev patches # udev patches
%patch1001 -p1 %patch1001 -p1

View File

@ -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 Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
# PATCH-FIX-SUSE Detect XEN dom0 as well as domU # PATCH-FIX-SUSE Detect XEN dom0 as well as domU
Patch196: systemd-detect-xendom.patch 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 # UDEV PATCHES
# ============ # ============
@ -741,6 +743,7 @@ cp %{SOURCE7} m4/
%patch194 -p0 %patch194 -p0
%patch195 -p0 %patch195 -p0
%patch196 -p1 %patch196 -p1
%patch197 -p1
# udev patches # udev patches
%patch1001 -p1 %patch1001 -p1