Dr. Werner Fink 2014-04-17 13:36:39 +00:00 committed by Git OBS Bridge
parent a0412f9d5a
commit 382134ce31
2 changed files with 9 additions and 3 deletions

View File

@ -2,6 +2,8 @@
Wed Apr 16 10:17:13 UTC 2014 - werner@suse.de
- Use latest regenerate-initrd rpm macros (fate#313506)
- Add rescue-emergency-target-conflicts.patch to avoid that
emergency and rescue sulogin are fighting on console
-------------------------------------------------------------------
Tue Apr 15 12:19:24 UTC 2014 - werner@suse.de

View File

@ -385,6 +385,8 @@ Patch195: 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.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
# PATCH-FIX-SUSE Avoid a divide by zero sigtrap
Patch198: avoid-divide-by-zero-sigtrap.patch
# UDEV PATCHES
# ============
@ -478,10 +480,11 @@ Requires(post): systemd
%if %{defined regenerate_initrd_post}
Requires(post): coreutils
Requires(postun): coreutils
Requires(posttrans): coreutils
Requires(posttrans): suse-module-tools
Requires(posttrans): /sbin/mkinitrd
%else
Requires(post): mkinitrd
Requires(postun): mkinitrd
Requires(post): /sbin/mkinitrd
Requires(postun): /sbin/mkinitrd
%endif
Conflicts: systemd < 39
Conflicts: aaa_base < 11.5
@ -760,6 +763,7 @@ cp %{SOURCE7} m4/
%patch195 -p0
%patch196 -p1
%patch197 -p1
%patch198 -p1
# udev patches
%patch1001 -p1