Bug#782488: multipath-tools: updates for compatibility with property blacklist

[Mauricio Faria de Oliveira]

Package: src:multipath-tools
Version: 0.5.0-6
Severity: serious
Tags: patch

Hi Ritesh,

multipath-tools 0.5.0 contains commit "multipath: Implement 'property'
blacklist", which started to blacklist devices that don't have any of
the whitelisted udev properties - initially, ID_WWN or ID_SCSI_VPD.

AFAICT, neither is set by udev rules installed by default in Debian,
rendering any SCSI disk blacklisted.

After 0.5.0, commit "Use 'SCSI_IDENT_.*' as the default property
whitelist" changed that to SCSI_IDENT_.* or ID_WWN.

The SCSI_IDENT_* attributes are defined by sg3-utils's udev rules,
but the current sg3-utils package doesn't install them.

I submitted a patch in #782487 that creates sg3-utils-udev to install
them, and to put them plus dependencies in the initramfs, as properties
must be defined on disk detection (even for non'-boot' multipath-tools).

With that patch for sg3-utils and the attached patch, the SCSI devices
are not anymore blacklisted by default.

May you please consider them for an upload to jessie?  Thanks!

-- 
Mauricio Faria de Oliveira
IBM Linux Technology Center
-------------- next part --------------
diff -Nru multipath-tools-0.5.0/debian/changelog multipath-tools-0.5.0/debian/changelog
--- multipath-tools-0.5.0/debian/changelog	2015-04-13 05:30:14.000000000 +0530
+++ multipath-tools-0.5.0/debian/changelog	2015-04-13 05:43:44.000000000 +0530
@@ -1,3 +1,11 @@
+multipath-tools (0.5.0-6pathselector1blankrev1property1) UNRELEASED; urgency=medium
+
+  * Updates for compatibility with commit "multipath: Implement 'property' blacklist".
+    - debian/control: multipath-tools: add dependency on sg3-utils-udev
+    - debian/patches/0015-libmultipath-property-whitelist-SCSI_IDENT.patch
+
+ -- Mauricio Faria de Oliveira <mauricfo at linux.vnet.ibm.com>  Sun, 12 Apr 2015 19:18:01 -0300
+
 multipath-tools (0.5.0-6pathselector1blankrev1) UNRELEASED; urgency=medium
 
   * 0014-libmultipath-discovery-blank-rev-attr.patch: fix discovery of devices with blank rev.
diff -Nru multipath-tools-0.5.0/debian/control multipath-tools-0.5.0/debian/control
--- multipath-tools-0.5.0/debian/control	2014-09-06 15:22:50.000000000 +0530
+++ multipath-tools-0.5.0/debian/control	2015-04-13 05:43:44.000000000 +0530
@@ -12,7 +12,7 @@
 Package: multipath-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>= 0.124), initscripts (>= 2.85-16),
- kpartx (>= ${binary:Version}), lsb-base (>= 3), libaio1 (>= 0.3.106-8)
+ kpartx (>= ${binary:Version}), lsb-base (>= 3), libaio1 (>= 0.3.106-8), sg3-utils-udev
 Breaks: multipath-tools-initramfs (<= 1.0.1),
  multipath-tools-boot (<= 0.4.8+git0.761c66f-2~)
 Suggests: multipath-tools-boot
diff -Nru multipath-tools-0.5.0/debian/patches/0015-libmultipath-property-whitelist-SCSI_IDENT.patch multipath-tools-0.5.0/debian/patches/0015-libmultipath-property-whitelist-SCSI_IDENT.patch
--- multipath-tools-0.5.0/debian/patches/0015-libmultipath-property-whitelist-SCSI_IDENT.patch	1970-01-01 05:30:00.000000000 +0530
+++ multipath-tools-0.5.0/debian/patches/0015-libmultipath-property-whitelist-SCSI_IDENT.patch	2015-04-13 05:43:44.000000000 +0530
@@ -0,0 +1,29 @@
+Origin: http://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commit;h=d041591e42b69e2ff99d9cc5c1111c83ccde3207
+From: Hannes Reinecke <hare at suse.de>
+Date: Thu, 10 Apr 2014 10:21:52 +0000 (+0200)
+Subject: Use 'SCSI_IDENT_.*' as the default property whitelist
+X-Git-Url: http://git.opensvc.com/gitweb.cgi?p=multipath-tools%2F.git;a=commitdiff_plain;h=d041591e42b69e2ff99d9cc5c1111c83ccde3207
+
+Use 'SCSI_IDENT_.*' as the default property whitelist
+
+59-scsi-sg_utils.rules export the VPD pages as
+SCSI_IDENT_<association>_<type>.
+So whenever we have a SCSI_IDENT_* property we know it
+has come from VPD pages and we have a legit device.
+
+Signed-off-by: Hannes Reinecke <hare at suse.de>
+---
+
+diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
+index cea128c..30c5031 100644
+--- a/libmultipath/blacklist.c
++++ b/libmultipath/blacklist.c
+@@ -196,7 +196,7 @@ setup_default_blist (struct config * conf)
+ 	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
+ 		return 1;
+ 
+-	str = STRDUP("(ID_SCSI_VPD|ID_WWN)");
++	str = STRDUP("(SCSI_IDENT_.*|ID_WWN)");
+ 	if (!str)
+ 		return 1;
+ 	if (store_ble(conf->elist_property, str, ORIGIN_DEFAULT))
diff -Nru multipath-tools-0.5.0/debian/patches/series multipath-tools-0.5.0/debian/patches/series
--- multipath-tools-0.5.0/debian/patches/series	2015-04-13 05:30:14.000000000 +0530
+++ multipath-tools-0.5.0/debian/patches/series	2015-04-13 05:43:44.000000000 +0530
@@ -5,3 +5,4 @@
 0012-format-security-build-fixes.patch
 0013-fix-spelling-error.patch
 0014-libmultipath-discovery-blank-rev-attr.patch
+0015-libmultipath-property-whitelist-SCSI_IDENT.patch