From 01715dffbbe4b85a292537a13c7a459e83a4c77f09e2ad71f79927c4375d9a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= <ptesarik@suse.com>
Date: Fri, 14 Feb 2014 16:11:37 +0000
Subject: [PATCH] Accepting request 222333 from
 home:juwolf:branches:Kernel:kdump

In rc.kdump.functions, function load_kdump(), the argument order for kdumptool in verbose/debug-mode is wrong. $(kdumptool find_kernel -D) leads to "invalid option", $(kdumptool -D find_kernel) works.

OBS-URL: https://build.opensuse.org/request/show/222333
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=56
---
 kdump.changes               |  6 ++++++
 kdump.spec                  |  2 ++
 kdumptool_find_kernel.patch | 11 +++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 kdumptool_find_kernel.patch

diff --git a/kdump.changes b/kdump.changes
index bb923eb..46a8342 100644
--- a/kdump.changes
+++ b/kdump.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 14 12:15:14 UTC 2014 - juwolf@suse.com
+
+- Added patch kdumptool_find_kernel.patch: kdumptool argument order was
+  wrong in debug mode 
+
 -------------------------------------------------------------------
 Fri Jan 24 02:26:20 UTC 2014 - mpost@suse.com
 
diff --git a/kdump.spec b/kdump.spec
index 7ea360c..cc35db1 100644
--- a/kdump.spec
+++ b/kdump.spec
@@ -47,6 +47,7 @@ PreReq:         %insserv_prereq %fillup_prereq mkinitrd
 Source:         %{name}-%{version}.tar.bz2
 Source2:        %{name}-%{version}-rpmlintrc
 Source3:        kdump.service
+Patch1:         kdumptool_find_kernel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2)
 Provides:       kdump-helpers = %{version}
@@ -84,6 +85,7 @@ Authors:
 
 %prep
 %setup
+%patch1 -p0
 %build
 export CFLAGS="%optflags"
 export CXXFLAGS="%optflags"
diff --git a/kdumptool_find_kernel.patch b/kdumptool_find_kernel.patch
new file mode 100644
index 0000000..474095e
--- /dev/null
+++ b/kdumptool_find_kernel.patch
@@ -0,0 +1,11 @@
+--- init/rc.kdump.functions.old	2014-01-13 07:35:41.000000000 +0100
++++ init/rc.kdump.functions	2014-02-14 12:46:28.375308000 +0100
+@@ -261,7 +261,7 @@
+         find_kernel_args="-D"
+     fi
+ 
+-    local output=$(kdumptool find_kernel $find_kernel_args)
++    local output=$(kdumptool $find_kernel_args find_kernel)
+     if [ $? -ne 0 ] ; then
+         rc_status -s
+         rc_failed 6