From c8bca0e4b841a3335efd98db8f6c004e0e6f36a6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2015 12:40:46 +0000 Subject: import device-mapper-multipath-0.4.9-77.el7_1.2 --- diff --git a/SOURCES/0107-UPBZ-1254292-iscsi-targetname.patch b/SOURCES/0107-UPBZ-1254292-iscsi-targetname.patch new file mode 100644 index 0000000..26a6831 --- /dev/null +++ b/SOURCES/0107-UPBZ-1254292-iscsi-targetname.patch @@ -0,0 +1,17 @@ +--- + libmultipath/discovery.c | 2 ++ + 1 file changed, 2 insertions(+) + +Index: multipath-tools-130222/libmultipath/discovery.c +=================================================================== +--- multipath-tools-130222.orig/libmultipath/discovery.c ++++ multipath-tools-130222/libmultipath/discovery.c +@@ -280,6 +280,8 @@ sysfs_get_tgt_nodename (struct path *pp, + const char *value; + + value = udev_device_get_sysattr_value(tgtdev, "tgtname"); ++ if (!value) ++ value = udev_device_get_sysattr_value(tgtdev, "targetname"); + if (value) { + pp->sg_id.proto_id = SCSI_PROTOCOL_ISCSI; + pp->sg_id.transport_id = tgtid; diff --git a/SPECS/device-mapper-multipath.spec b/SPECS/device-mapper-multipath.spec index e87923c..937c5c6 100644 --- a/SPECS/device-mapper-multipath.spec +++ b/SPECS/device-mapper-multipath.spec @@ -1,7 +1,7 @@ Summary: Tools to manage multipath devices using device-mapper Name: device-mapper-multipath Version: 0.4.9 -Release: 77%{?dist}.1 +Release: 77%{?dist}.2 License: GPL+ Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -114,6 +114,7 @@ Patch0103: 0103-RHBZ-1148979-fix-partition-mapping-creation-race-with-kpartx.pat Patch0104: 0104-RHBZ-1159337-fix-double-free.patch Patch0105: 0105-RHBZ-1180032-find-multipaths-man.patch Patch0106: 0106-RHBZ-1212590-dont-use-var.patch +Patch0107: 0107-UPBZ-1254292-iscsi-targetname.patch # runtime Requires: %{name}-libs = %{version}-%{release} @@ -272,6 +273,7 @@ kpartx manages partition creation and removal for device-mapper devices. %patch0104 -p1 %patch0105 -p1 %patch0106 -p1 +%patch0107 -p1 cp %{SOURCE1} . %build @@ -366,6 +368,11 @@ bin/systemctl --no-reload enable multipathd.service >/dev/null 2>&1 ||: %{_mandir}/man8/kpartx.8.gz %changelog +* Wed Sep 30 2015 Benjamin Marzinski 0.4.9-77.2 +- Add 0107-UPBZ-1254292-iscsi-targetname.patch + * check for targetname iscsi sysfs value +- Resolves: bz #1267131 + * Thu Jul 30 2015 Benjamin Marzinski 0.4.9-77.1 - Add 0106-RHBZ-1212590-dont-use-var.patch * use /run instead of /var/run