diff --git a/0001-multipath-Write-proper-regex-into-multipath-conf.patch b/0001-multipath-Write-proper-regex-into-multipath-conf.patch new file mode 100644 index 0000000..c256592 --- /dev/null +++ b/0001-multipath-Write-proper-regex-into-multipath-conf.patch @@ -0,0 +1,26 @@ +From 4ce21a05fdfa91cb894d140c1962b29fb4b1431a Mon Sep 17 00:00:00 2001 +From: Julian Wolf +Date: Mon, 1 Sep 2014 15:46:21 +0200 +Subject: multipath: Write proper regex into multipath.conf + +Signed-off-by: Julian Wolf +--- + kdumptool/multipath.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kdumptool/multipath.cc b/kdumptool/multipath.cc +index 4ffe493..a9acafc 100644 +--- a/kdumptool/multipath.cc ++++ b/kdumptool/multipath.cc +@@ -206,7 +206,7 @@ void AddBlacklistHandler::outputLine(const string &raw) + // ----------------------------------------------------------------------------- + void AddBlacklistHandler::doBlacklist(lineHandler handler) + { +- (this->*handler)("\twwid \"*\"\n"); ++ (this->*handler)("\twwid \".*\"\n"); + m_blacklist_done = true; + } + +-- +1.8.1.4 + diff --git a/kdump.changes b/kdump.changes index 70e16ac..3e72b62 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 1 14:21:38 UTC 2014 - juwolf@suse.com + +- Write proper regex into multipath.conf to prevent syntax error there + (bnc#883883) + Add: 0001-multipath-Write-proper-regex-into-multipath-conf.patch + ------------------------------------------------------------------- Mon Aug 18 10:18:48 UTC 2014 - ptesarik@suse.cz diff --git a/kdump.spec b/kdump.spec index 64151f3..41bfc9d 100644 --- a/kdump.spec +++ b/kdump.spec @@ -64,6 +64,7 @@ PreReq: mkinitrd Source: %{name}-%{version}.tar.bz2 Source2: %{name}-rpmlintrc Source3: kdump.service +Patch0: 0001-multipath-Write-proper-regex-into-multipath-conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = %{version} @@ -101,6 +102,7 @@ Authors: %prep %setup +%patch0 -p1 %build export CFLAGS="%optflags"