[PATCH 10/11] multipath-tools: move code up in Makefile

[PATCH 10/11] multipath-tools: move code up in Makefile

[Xose Vazquez Perez]

Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 7786c83..95c7dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,12 @@ ifeq ($(KRNLSRC),)
 	endif
 endif
 
+ifeq ($(MULTIPATH_VERSION),)
+	VERSION = $(shell basename ${PWD} | cut -d'-' -f3)
+else
+	VERSION = $(MULTIPATH_VERSION)
+endif
+
 export KRNLSRC
 export KRNLOBJ
 
@@ -30,12 +36,6 @@ BUILDDIRS = \
 	mpathpersist \
 	kpartx
 
-ifeq ($(MULTIPATH_VERSION),)
-	VERSION = $(shell basename ${PWD} | cut -d'-' -f3)
-else
-	VERSION = $(MULTIPATH_VERSION)
-endif
-
 all: recurse
 
 recurse:
-- 
2.7.4

[PATCH 11/11] multipath-tools: modify product regex in HDS devices

[Xose Vazquez Perez]

regex for product="DF" is tooooo wide.
Also changed for VSP to "^OPEN-"

I asked Matthias before make this change.

Cc: Matthias Rudolph <Matthias.Rudolph@hds.com>
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
 libmultipath/hwtable.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index 62633b1..a69002f 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -278,14 +278,14 @@ static struct hwentry default_hw[] = {
 	{
 		/* USP-V, HUS VM, VSP, VSP G1000 and VSP GX00 families */
 		.vendor        = "(HITACHI|HP)",
-		.product       = "OPEN-",
+		.product       = "^OPEN-",
 		.pgpolicy      = MULTIBUS,
 		.pgfailback    = FAILBACK_UNDEF,
 	},
 	{
 		/* AMS 2000 and HUS 100 families */
 		.vendor        = "HITACHI",
-		.product       = "DF",
+		.product       = "^DF",
 		.features      = "1 queue_if_no_path",
 		.pgpolicy      = GROUP_BY_PRIO,
 		.pgfailback    = -FAILBACK_IMMEDIATE,
-- 
2.7.4