diff --git a/multipath-fix.patch b/multipath-fix.patch new file mode 100644 index 0000000..1b441ef --- /dev/null +++ b/multipath-fix.patch @@ -0,0 +1,13 @@ +Index: kpartx/kpartx.c +=================================================================== +--- kpartx/kpartx.c.orig ++++ kpartx/kpartx.c +@@ -578,7 +578,7 @@ main(int argc, char **argv){ + continue; + + if (!dm_simplecmd(DM_DEVICE_REMOVE, +- partname)) { ++ partname, 1)) { + r++; + continue; + } diff --git a/multipath-tools.changes b/multipath-tools.changes index 94972eb..1d98954 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 8 20:56:53 UTC 2009 - aj@suse.de + +- Fix last patch, one caller of dm_simplecmd was not updated + (multipath-fix.patch). + ------------------------------------------------------------------- Fri Aug 21 15:49:47 CEST 2009 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index c0657a5..231aef5 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -21,17 +21,18 @@ Name: multipath-tools BuildRequires: device-mapper-devel libaio-devel readline-devel Url: http://christophe.varoqui.free.fr/ -License: BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware ; MIT License (or similar) +License: BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware ; MIT License (or similar) Group: System/Base Requires: device-mapper kpartx PreReq: %insserv_prereq %fillup_prereq coreutils grep AutoReqProv: on Version: 0.4.8 -Release: 42 +Release: 43 Summary: Tools to Manage Multipathed Devices with the device-mapper Source: multipath-tools-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: %{name}-%{version}-opensuse-11.2.diff.bz2 +Patch1: multipath-fix.patch %description This package provides the tools to manage multipathed devices by @@ -55,7 +56,7 @@ Authors: Christophe Varoqui %package -n kpartx -License: BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware ; MIT License (or similar) +License: BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware ; MIT License (or similar) Summary: Manages partition tables on device-mapper devices Group: System/Base Requires: device-mapper @@ -71,8 +72,9 @@ Authors: Christophe Varoqui %prep -%setup -n multipath-tools-%{version} +%setup -q -n multipath-tools-%{version} %patch0 -p1 +%patch1 %build # This package failed when testing with -Wl,-as-needed being default.