Bug#801851: jessie-pu: package multipath-tools/0.5.0-6+deb8u1
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
This update to multipath-tools fixes a couple of problems. Details are
referenced in the changelog, and further details are present in
referenced bugs.
All these changes are already available in Unstable
Please let me know when I can upload.
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.2.3+ (SMP w/4 CPU cores)
Locale: LANG=en_IN.utf8, LC_CTYPE=en_IN.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru multipath-tools-0.5.0/debian/changelog multipath-tools-0.5.0/debian/changelog
--- multipath-tools-0.5.0/debian/changelog 2015-05-28 01:01:37.000000000 +0530
+++ multipath-tools-0.5.0/debian/changelog 2015-10-15 14:49:35.000000000 +0530
@@ -1,3 +1,19 @@
+multipath-tools (0.5.0-6+deb8u3) jessie; urgency=medium
+
+ * fix discovery of devices with blank rev
+ - 0014-libmultipath-discovery-blank-rev-attr.patch:
+ * Updates for compatibility with commit "multipath: Implement
+ 'property' blacklist".
+ - 0015-libmultipath-property-whitelist-SCSI_IDENT.patch
+ Thanks to Mauricio Faria de Oliveira (Closes: #782400, #782488)
+ * [5ffc2f4] Add documentation to cover additional friendly names
+ scenarios. Thanks to Scott Moser (Closes: #788841)
+ * [af3f228] init: Fix stop failure when no root device is found
+ (Closes: #795278)
+ * [b77859e] Add debian/gbp.conf to use pristine-tar branch
+
+ -- Ritesh Raj Sarraf <rrs@debian.org> Thu, 15 Oct 2015 14:16:45 +0530
+
multipath-tools (0.5.0-6+deb8u1) jessie; urgency=medium
* [b40599e] Add dm-service-time path checked.
diff -Nru multipath-tools-0.5.0/debian/gbp.conf multipath-tools-0.5.0/debian/gbp.conf
--- multipath-tools-0.5.0/debian/gbp.conf 1970-01-01 05:30:00.000000000 +0530
+++ multipath-tools-0.5.0/debian/gbp.conf 2015-10-15 14:49:35.000000000 +0530
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff -Nru multipath-tools-0.5.0/debian/multipath-tools.init multipath-tools-0.5.0/debian/multipath-tools.init
--- multipath-tools-0.5.0/debian/multipath-tools.init 2015-05-28 01:01:37.000000000 +0530
+++ multipath-tools-0.5.0/debian/multipath-tools.init 2015-10-15 14:47:24.000000000 +0530
@@ -63,16 +63,20 @@
;;
stop)
DONT_STOP_MPATHD=0
- root_dev=$(awk '{ if ($1 !~ /^[ \t]*#/ && $1 ~ /\// && $2 == "/") { print $1; }}' /etc/mtab)
- dm_num=$(dmsetup info -c --noheadings -o minor $root_dev 2>/dev/null)
- if [ $? -ne 0 ]; then
+ root_dev=$(awk '{ if ($1 !~ /^[ \t]*#/ && $1 ~ /\// && $2 == "/") { print $1; }}' /etc/mtab)
+ if [ -n "$root_dev" ]; then
+ dm_num=$(dmsetup info -c --noheadings -o minor $root_dev 2>/dev/null)
+ else
+ dm_num=
+ fi
+ if [ $? -ne 0 -o -z "$dm_num" ]; then
# Looks like we couldn't find a device mapper root device
# But we shouldn't bail out here, otherwise the stop target and the
# upgrade processes will break. See DBUG #674733
- echo;
+ :
else
root_dm_device="dm-$dm_num"
- [ -d $syspath/$root_dm_device ] && teardown_slaves $syspath/$root_dm_device
+ [ -d "$syspath/$root_dm_device" ] && teardown_slaves $syspath/$root_dm_device
fi
if [ x$DONT_STOP_MPATHD = x0 ]; then
diff -Nru multipath-tools-0.5.0/debian/multipath-tools.README.Debian multipath-tools-0.5.0/debian/multipath-tools.README.Debian
--- multipath-tools-0.5.0/debian/multipath-tools.README.Debian 2015-05-28 01:01:37.000000000 +0530
+++ multipath-tools-0.5.0/debian/multipath-tools.README.Debian 2015-10-15 14:47:24.000000000 +0530
@@ -25,6 +25,20 @@
This device should be accessible as /dev/mapper/diskbox1-lun0.
+
+If using user_friendly_names = yes, please ensure that your /etc/multipath/bindings
+file gets propagated to the initramfs.
+
+For that, please follow the following steps:
+
+1) set "user_friendly_names = yes" in /etc/multipath.conf
+2) Run `multipath -F` to flush your device maps. For root on multipath devices,
+ this could still be tricky
+3) Run `multipath -v3` to read your /etc/multipath.conf changes.
+4) Run `update-initramfs -u -k all` to update your initramfs images.
+
+
+
Where did my FC-connected filesystem go?
========================================
If you were previously mounting a device connected to your system by
diff -Nru multipath-tools-0.5.0/debian/patches/0014-libmultipath-discovery-blank-rev-attr.patch multipath-tools-0.5.0/debian/patches/0014-libmultipath-discovery-blank-rev-attr.patch
--- multipath-tools-0.5.0/debian/patches/0014-libmultipath-discovery-blank-rev-attr.patch 1970-01-01 05:30:00.000000000 +0530
+++ multipath-tools-0.5.0/debian/patches/0014-libmultipath-discovery-blank-rev-attr.patch 2015-10-15 14:47:24.000000000 +0530
@@ -0,0 +1,37 @@
+Forwarded: https://www.redhat.com/archives/dm-devel/2015-April/msg00049.html
+From b7ec63e727880aa709c2aa7b6029dba9ad7d9d74 Mon Sep 17 00:00:00 2001
+From: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
+Date: Sat, 11 Apr 2015 12:02:29 -0300
+Subject: [PATCH] libmultipath: fix discovery of devices with sysfs attr containing only spaces
+
+commit 43c61e979521b17d9f50ea8e722682c33d0b7d69 causes sysfs_get_<attr>() to
+return 0 if attr contains only spaces, and scsi_sysfs_pathinfo() to return 1
+in 'if (sysfs_get_<attr>() <= 0)'; this breaks the device's discovery.
+
+Changing the comparison operator '<=' to '<' allows discovery to continue.
+
+This affects some IPR controllers (rev sysfs attr):
+
+ # grep . /sys/block/sda/device/{vendor,model,rev} | tr ' ' '#'
+ /sys/block/sda/device/vendor:IBM#####
+ /sys/block/sda/device/model:IPR-0###5EC99A00
+ /sys/block/sda/device/rev:####
+
+Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
+---
+ libmultipath/discovery.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: multipath-tools-0.5.0/libmultipath/discovery.c
+===================================================================
+--- multipath-tools-0.5.0.orig/libmultipath/discovery.c
++++ multipath-tools-0.5.0/libmultipath/discovery.c
+@@ -661,7 +661,7 @@ scsi_sysfs_pathinfo (struct path * pp)
+
+ condlog(3, "%s: product = %s", pp->dev, pp->product_id);
+
+- if (sysfs_get_rev(parent, pp->rev, SCSI_REV_SIZE) <= 0)
++ if (sysfs_get_rev(parent, pp->rev, SCSI_REV_SIZE) < 0)
+ return 1;
+
+ condlog(3, "%s: rev = %s", pp->dev, pp->rev);
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-10-15 14:47:24.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@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@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-05-28 01:01:37.000000000 +0530
+++ multipath-tools-0.5.0/debian/patches/series 2015-10-15 14:47:24.000000000 +0530
@@ -4,3 +4,5 @@
0011-patch-udev-rule.patch
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
Reply to: