diff options
author | Changqing Li <changqing.li@windriver.com> | 2018-07-18 15:31:22 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-07-20 16:07:12 -0700 |
commit | 3dc38c444b5fc88f9f0ba342a2e7db4c6566719f (patch) | |
tree | 9e5e01abfada189189bb79f57e7647f7a5c34c82 /meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch | |
parent | 61c6d99fb814be8ba295d6923f549179dfb51fe8 (diff) | |
download | meta-openembedded-contrib-3dc38c444b5fc88f9f0ba342a2e7db4c6566719f.tar.gz |
multipath-tools: upgrade 0.7.1 -> 0.7.7
1. Backport patches from fedora:
git://pkgs.fedoraproject.org/rpms/device-mapper-multipath
- 0001 ~ 0028
2. drop obsolute patch and rebase still needed patch
rebased patch: 0029~0031
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch')
-rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch b/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch deleted file mode 100644 index 396b6d32e3..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f88d60a93e98d86ae294f2317a122c4efde276f0 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Wed, 31 May 2017 17:58:59 -0500 -Subject: [PATCH 10/14] mpath: skip device configs without vendor/product - -Right now if multipath.conf includes a device configuration without a -vendor or product string, it will automatically be applied to all -devices, skipping all other configs entirely. This is clearly wrong. -This patch makes sure that user added configs include vendor and -product strings - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> ---- - libmultipath/config.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/libmultipath/config.c b/libmultipath/config.c -index c485748..bdde113 100644 ---- a/libmultipath/config.c -+++ b/libmultipath/config.c -@@ -452,6 +452,13 @@ restart: - break; - j = n; - vector_foreach_slot_after(hw, hwe2, j) { -+ /* drop invalid device configs */ -+ if (!hwe2->vendor || !hwe2->product) { -+ condlog(0, "device config missing vendor or product parameter"); -+ vector_del_slot(hw, j--); -+ free_hwe(hwe2); -+ continue; -+ } - if (hwe_regmatch(hwe1, hwe2)) - continue; - /* dup */ --- -2.8.1 - |