From 4be4f8bd91deb5b5129a118969aee31876083b70f4fbf7aa1f562d14bd6ed5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= <ptesarik@suse.com>
Date: Fri, 26 Oct 2012 15:55:05 +0000
Subject: [PATCH] Accepting request 137435 from
 home:elvigia:branches:Kernel:kdump

*** Please forward to 12.2 Updates as appropiate *****

- Since the /usr merge, the mkinitrd bits are broken
  since tools have changed locations.
- Recommend nfs-client and cifs-utils too.

OBS-URL: https://build.opensuse.org/request/show/137435
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=42
---
 kdump-usrmerge.patch | 14 ++++++++++++++
 kdump.changes        |  7 +++++++
 kdump.spec           |  5 +++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 kdump-usrmerge.patch

diff --git a/kdump-usrmerge.patch b/kdump-usrmerge.patch
new file mode 100644
index 0000000..a591238
--- /dev/null
+++ b/kdump-usrmerge.patch
@@ -0,0 +1,14 @@
+--- init/boot-kdump.sh.orig
++++ init/boot-kdump.sh
+@@ -17,9 +17,9 @@
+ #
+ #%stage: setup
+ #%depends: mount network
+-#%programs: /bin/makedumpfile /bin/awk /bin/gawk /bin/grep /sbin/kdumptool /sbin/showmount /sbin/mount.cifs mount.nfs
++#%programs: /bin/makedumpfile /usr/bin/awk /usr/bin/gawk /bin/grep /usr/sbin/kdumptool /usr/sbin/showmount /sbin/mount.cifs mount.nfs
+ #%if: "$use_kdump"
+-#%udevmodules: cifs nls_utf8 reiserfs xfs ext2 ext3
++#%udevmodules: cifs nls_utf8 reiserfs xfs ext2 ext3 ext4 btrfs
+ 
+ #
+ # If KDUMP_IMMEDIATE_REBOOT is false, then open a shell. If it's true, then
diff --git a/kdump.changes b/kdump.changes
index be041f9..e36dc47 100644
--- a/kdump.changes
+++ b/kdump.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Oct  7 22:16:04 UTC 2012 - crrodriguez@opensuse.org
+
+- Since the /usr merge, the mkinitrd bits are broken
+  since tools have changed locations.
+- Recommend nfs-client and cifs-utils too. 
+
 -------------------------------------------------------------------
 Wed Apr 11 03:45:19 UTC 2012 - jeffm@suse.com.
 
diff --git a/kdump.spec b/kdump.spec
index 73758cc..416b71a 100644
--- a/kdump.spec
+++ b/kdump.spec
@@ -48,7 +48,7 @@ Patch2:         kdump-format-list
 Patch3:         kdump-save-log
 Patch4:         kdump-add-none-format
 Patch5:         kdump-udev-rule
-
+Patch6:         kdump-usrmerge.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2)
 Provides:       kdump-helpers = 0.2.4
@@ -56,6 +56,7 @@ Obsoletes:      kdump-helpers <= 0.2.4
 # update should detect the split-off from kexec-tools
 Provides:       kexec-tools:/etc/init.d/kdump
 Requires:       kexec-tools
+Recommends:     nfs-client cifs-utils
 PreReq:         coreutils sed
 ExcludeArch:    s390 s390x ppc
 
@@ -88,7 +89,7 @@ Authors:
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-
+%patch6
 %build
 export CFLAGS="%optflags"
 export CXXFLAGS="%optflags"