From patchwork Mon Sep 28 18:28:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bmarzins@sourceware.org X-Patchwork-Id: 50434 X-Patchwork-Delegate: bmarzins@redhat.com Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8SIT6OS023506 for ; Mon, 28 Sep 2009 18:29:06 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id ED7518E0233; Mon, 28 Sep 2009 14:29:04 -0400 (EDT) Received: from int-mx01.intmail.prod.int.phx2.redhat.com (nat-pool.util.phx.redhat.com [10.8.5.200]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n8SIT3OJ003389 for ; Mon, 28 Sep 2009 14:29:03 -0400 Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.6]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8SIT2Mr011341 for ; Mon, 28 Sep 2009 14:29:02 -0400 Received: from sourceware.org (sourceware.org [209.132.176.174]) by mx1.redhat.com (8.13.8/8.13.8) with SMTP id n8SISnmC015354 for ; Mon, 28 Sep 2009 14:28:49 -0400 Received: (qmail 11619 invoked by uid 9475); 28 Sep 2009 18:28:49 -0000 Date: 28 Sep 2009 18:28:49 -0000 Message-ID: <20090928182849.11617.qmail@sourceware.org> From: bmarzins@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -4 (RCVD_IN_DNSWL_MED) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.6 X-loop: dm-devel@redhat.com Cc: Subject: [dm-devel] multipath-tools ./multipath.conf.defaults libm ... X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com CVSROOT: /cvs/dm Module name: multipath-tools Branch: RHEL5_FC6 Changes by: bmarzins@sourceware.org 2009-09-28 18:28:48 Modified files: . : multipath.conf.defaults libmultipath : hwtable.c Log message: Fix for bz #504619. MSA 1000s with new firmware can't list the vendor as HP or COMPAQ, same as with the old firmware. Updated the default configuration to match this. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipath.conf.defaults.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.5.4.15&r2=1.5.4.16 http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/hwtable.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.20.2.21&r2=1.20.2.22 --- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- multipath-tools/multipath.conf.defaults 2009/08/19 21:52:40 1.5.4.15 +++ multipath-tools/multipath.conf.defaults 2009/09/28 18:28:48 1.5.4.16 @@ -71,7 +71,7 @@ # path_checker tur # } # device { -# vendor "HP" +# vendor "(COMPAQ|HP)" # product "MSA VOLUME" # getuid_callout "/sbin/scsi_id -g -u -s /block/%n" # prio_callout "/sbin/mpath_prio_alua %n" --- multipath-tools/libmultipath/hwtable.c 2009/08/31 17:17:10 1.20.2.21 +++ multipath-tools/libmultipath/hwtable.c 2009/09/28 18:28:48 1.20.2.22 @@ -108,7 +108,7 @@ }, { /* MSA 1000/1500 with new firmware */ - .vendor = "HP", + .vendor = "(COMPAQ|HP)", .product = "MSA VOLUME", .getuid = DEFAULT_GETUID, .getprio = "/sbin/mpath_prio_alua /dev/%n",