diff -Nru multipath-tools-0.5.0+git1.656f8865/debian/changelog multipath-tools-0.5.0+git1.656f8865/debian/changelog --- multipath-tools-0.5.0+git1.656f8865/debian/changelog 2016-06-21 04:22:06.000000000 -0500 +++ multipath-tools-0.5.0+git1.656f8865/debian/changelog 2016-07-08 16:23:18.000000000 -0500 @@ -1,3 +1,11 @@ +multipath-tools (0.5.0+git1.656f8865-5ubuntu2.2~lp1570093~1) xenial; urgency=medium + + * multipath-tools: fix dm- device filtering + - Allow filtering of DEV_UEVENT dev_type + - Resolves LP: #1570093 + + -- Dragan Stancevic Fri, 08 Jul 2016 15:51:47 -0500 + multipath-tools (0.5.0+git1.656f8865-5ubuntu2.1) xenial; urgency=medium * Cherrypick from debian: diff -Nru multipath-tools-0.5.0+git1.656f8865/debian/patches/0001-multipath-tools-fix-dm-device-filtering.patch multipath-tools-0.5.0+git1.656f8865/debian/patches/0001-multipath-tools-fix-dm-device-filtering.patch --- multipath-tools-0.5.0+git1.656f8865/debian/patches/0001-multipath-tools-fix-dm-device-filtering.patch 1969-12-31 18:00:00.000000000 -0600 +++ multipath-tools-0.5.0+git1.656f8865/debian/patches/0001-multipath-tools-fix-dm-device-filtering.patch 2016-07-08 10:13:45.000000000 -0500 @@ -0,0 +1,43 @@ +From 7dcf982221f1aa63226babaee2c41d8b0652b6d8 Mon Sep 17 00:00:00 2001 +From: Dragan Stancevic +Date: Thu, 23 Jun 2016 15:29:37 -0500 +Subject: [PATCH 1/1] multipath-tools: fix dm- device filtering + +During "service multipath-tools start" /sbin/multipath is +called on dm- devices that are filtered but due to a condition +conf->dev_type == DEV_DEVNODE in filtering code multipath +binary wasn't dropping out when hitting a dm- device. This +was due to the fact that in this case conf->dev_type is +set to DEV_UEVENT. + +This is causing the logs to be filled with following +messages: + +multipath: dm-6: failed to get udev uid: Invalid argument +multipath: dm-6: failed to get sysfs uid: Invalid argument +multipath: dm-6: failed to get sgio uid: No such file or directory + +This change alows the filtering to happen. + +Cc: Christophe Varoqui +Cc: device-mapper development + +Signed-off-by: Dragan Stancevic +--- + multipath/main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: multipath-tools-0.5.0+git1.656f8865/multipath/main.c +=================================================================== +--- multipath-tools-0.5.0+git1.656f8865.orig/multipath/main.c ++++ multipath-tools-0.5.0+git1.656f8865/multipath/main.c +@@ -267,7 +267,8 @@ configure (void) + /* + * if we have a blacklisted device parameter, exit early + */ +- if (dev && conf->dev_type == DEV_DEVNODE && ++ if (dev && (conf->dev_type == DEV_DEVNODE || ++ conf->dev_type == DEV_UEVENT) && + conf->cmd != CMD_REMOVE_WWID && + (filter_devnode(conf->blist_devnode, + conf->elist_devnode, dev) > 0)) { diff -Nru multipath-tools-0.5.0+git1.656f8865/debian/patches/series multipath-tools-0.5.0+git1.656f8865/debian/patches/series --- multipath-tools-0.5.0+git1.656f8865/debian/patches/series 2016-04-04 21:36:42.000000000 -0500 +++ multipath-tools-0.5.0+git1.656f8865/debian/patches/series 2016-07-08 10:10:19.000000000 -0500 @@ -16,3 +16,4 @@ git-kpartx-support-spaces-in-dev-names-b407050a.patch kpartx_more_loopback_fixes.patch enable-find-multipaths.patch +0001-multipath-tools-fix-dm-device-filtering.patch