multipath-tools: Default configuration changes

Add support for some more MSA arrays.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index a207fc6..fabf9a8 100644 (file)
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -128,7 +128,7 @@ static struct hwentry default_hw[] = {
        },
        {
                /* MSA 1000/1500 with new firmware */
-               .vendor        = "HP",
+               .vendor        = "(COMPAQ|HP)",
                .product       = "MSA VOLUME",
                .getuid        = DEFAULT_GETUID,
                .features      = DEFAULT_FEATURES,

diff --git a/multipath.conf.defaults b/multipath.conf.defaults
index d24a801..7aeed79 100644 (file)
--- a/multipath.conf.defaults
+++ b/multipath.conf.defaults
@@ -91,7 +91,7 @@
 #              prio                    hp_sw
 #      }
 #      device {
-#              vendor                  "HP"
+#              vendor                  "(COMPAQ|HP)"
 #              product                 "MSA VOLUME"
 #              getuid_callout          "/lib/udev/scsi_id --whitelisted --device=/dev/%n"
 #              features                "0"
@@ -122,7 +122,7 @@
 #      }
 #      device {
 #              vendor                  "(COMPAQ|HP)"
-#              product                 "HSV1[01]1|HSV2[01]0|HSV300"
+#              product                 "HSV1[01]1|HSV2[01]0|HSV300|HSV4[05]0"
 #              getuid_callout          "/lib/udev/scsi_id --whitelisted --device=/dev/%n"
 #              features                "0"
 #              hardware_handler        "0"