OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=13

2008-09-05 22:44:23 +00:00 · 2008-09-05 22:44:23 +00:00 · 9baa9141bb
commit 9baa9141bb
parent f013c8c301
3 changed files with 178 additions and 2 deletions
--- a/156
+++ b/156
@ -0,0 +1,156 @@
+diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
+index 0b39297..87b155e 100644
+--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
+@@ -1,4 +1,4 @@
+-#define DEFAULT_GETUID		"/lib/udev/scsi_id -g -u /dev/%n"
+#define DEFAULT_GETUID		"/lib/udev/scsi_id -g -u -d /dev/%n"
+ #define DEFAULT_UDEVDIR		"/dev"
+ #define DEFAULT_MULTIPATHDIR	"/lib/multipath"
+ #define DEFAULT_SELECTOR	"round-robin 0"
+diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
+index 48f9b1a..3f45257 100644
+--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
+@@ -172,7 +172,7 @@ static struct hwentry default_hw[] = {
+ 		/* HP Smart Array */
+ 		.vendor        = "HP",
+ 		.product       = "LOGICAL VOLUME.*",
+-		.getuid        = "/lib/udev/scsi_id -n -g -u /dev/%n",
+		.getuid        = "/lib/udev/scsi_id -n -g -u -d /dev/%n",
+ 		.features      = DEFAULT_FEATURES,
+ 		.hwhandler     = DEFAULT_HWHANDLER,
+ 		.selector      = DEFAULT_SELECTOR,
+@@ -214,7 +214,7 @@ static struct hwentry default_hw[] = {
+ 	{
+ 		.vendor        = "EMC",
+ 		.product       = "SYMMETRIX",
+-		.getuid        = "/lib/udev/scsi_id -g -u -ppre-spc3-83 /dev/%n",
+		.getuid        = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -d /dev/%n",
+ 		.features      = DEFAULT_FEATURES,
+ 		.hwhandler     = DEFAULT_HWHANDLER,
+ 		.selector      = DEFAULT_SELECTOR,
+@@ -337,6 +337,22 @@ static struct hwentry default_hw[] = {
+ 		.prio_name     = PRIO_RDAC,
+ 	},
+ 	{
+		/* IBM DS3400 */
+		.vendor        = "IBM",
+		.product       = "1726-4xx",
+		.getuid        = DEFAULT_GETUID,
+		.features      = "1 queue_if_no_path",
+		.hwhandler     = "1 rdac",
+		.selector      = DEFAULT_SELECTOR,
+		.pgpolicy      = GROUP_BY_PRIO,
+		.pgfailback    = -FAILBACK_IMMEDIATE,
+		.rr_weight     = RR_WEIGHT_NONE,
+		.no_path_retry = 300,
+		.minio         = DEFAULT_MINIO,
+		.checker_name  = RDAC,
+		.prio_name     = PRIO_RDAC,
+	},
+	{
+ 		/* IBM DS4400 / FAStT700 */
+ 		.vendor        = "IBM",
+ 		.product       = "1742",
+@@ -514,6 +530,22 @@ static struct hwentry default_hw[] = {
+ 		.checker_name  = DIRECTIO,
+ 		.prio_name     = DEFAULT_PRIO,
+ 	},
+	{
+		/* IBM IPR */
+		.vendor        = "IBM",
+		.product       = "IPR.*",
+		.getuid        = DEFAULT_GETUID,
+		.features      = "1 queue_if_no_path",
+		.hwhandler     = "1 alua",
+		.selector      = DEFAULT_SELECTOR,
+		.pgpolicy      = GROUP_BY_PRIO,
+		.pgfailback    = -FAILBACK_IMMEDIATE,
+		.rr_weight     = RR_WEIGHT_NONE,
+		.no_path_retry = NO_PATH_RETRY_UNDEF,
+		.minio         = DEFAULT_MINIO,
+		.checker_name  = TUR,
+		.prio_name     = PRIO_ALUA,
+	},
+ 	/*
+ 	 * NETAPP controller family
+ 	 *
+@@ -679,7 +711,7 @@ static struct hwentry default_hw[] = {
+ 	{
+ 		.vendor        = "PIVOT3",
+ 		.product       = "RAIGE VOLUME",
+-		.getuid        = "/sbin/scsi_id -p 0x80 -g -u -s /block/%n",
+		.getuid        = "/lib/udev/scsi_id -p 0x80 -g -u -d /dev/%n",
+ 		.features      = "1 queue_if_no_path",
+ 		.hwhandler     = DEFAULT_HWHANDLER,
+ 		.selector      = DEFAULT_SELECTOR,
+diff --git a/libmultipath/uxsock.c b/libmultipath/uxsock.c
+index f70e2f5..7bfc5d2 100644
+--- a/libmultipath/uxsock.c
+++ b/libmultipath/uxsock.c
+@@ -54,7 +54,6 @@ int ux_socket_listen(const char *name)
+ 	int fd;
+ 	struct sockaddr_un addr;
+ 
+-
+ 	/* get rid of any old socket */
+ 	unlink(name);
+ 
+diff --git a/multipath.conf.annotated b/multipath.conf.annotated
+index dda9e4c..a4c7e6a 100644
+--- a/multipath.conf.annotated
+++ b/multipath.conf.annotated
+@@ -49,7 +49,7 @@
+ #	#           path identifier. Absolute path required
+ #	# default : /lib/udev/scsi_id -g -u -s
+ #	#
+-#	getuid_callout	"/lib/udev/scsi_id -g -u -s /block/%n"
+#	getuid_callout	"/lib/udev/scsi_id -g -u -d /dev/%n"
+ #
+ #	#
+ #	# name    : prio
+@@ -312,7 +312,7 @@
+ #		#           path identifier. Absolute path required
+ #		# default : /lib/udev/scsi_id -g -u -s
+ #		#
+-#		getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
+#		getuid_callout          "/lib/udev/scsi_id -g -u -d /dev/%n"
+ #
+ #		#
+ #		# name    : prio
+diff --git a/multipath.conf.synthetic b/multipath.conf.synthetic
+index 33f820b..6459f56 100644
+--- a/multipath.conf.synthetic
+++ b/multipath.conf.synthetic
+@@ -7,7 +7,7 @@
+ #	polling_interval 	10
+ #	selector		"round-robin 0"
+ #	path_grouping_policy	multibus
+-#	getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
+#	getuid_callout		"/lib/udev/scsi_id -g -u -d /dev/%n"
+ #	prio			const
+ #	path_checker		directio
+ #	rr_min_io		100
+@@ -53,7 +53,7 @@
+ #		vendor			"COMPAQ  "
+ #		product			"HSV110 (C)COMPAQ"
+ #		path_grouping_policy	multibus
+-#		getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
+#		getuid_callout          "/lib/udev/scsi_id -g -u -d /dev/%n"
+ #		path_checker		directio
+ #		path_selector		"round-robin 0"
+ #		hardware_handler	"0"
+diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5
+index fc9d3da..90ef588 100644
+--- a/multipath/multipath.conf.5
+++ b/multipath/multipath.conf.5
+@@ -109,7 +109,7 @@ Default value is \fImultibus\fR.
+ The default program and args to callout to obtain a unique path
+ identifier. Should be specified with an absolute path. Default value
+ is
+-.I /lib/udev/scsi_id -g -u -s
+.I /lib/udev/scsi_id -g -u -d /dev/%n
+ .TP
+ .B prio_callout
+ The default program and args to callout to obtain a path priority
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Sep  3 11:09:34 CEST 2008 - hare@suse.de
+
+- Merge in fixes from upstream:
+  * Add IBM IPR to hardware table (bnc#419086)
+  * Add IBM DS4300 to hardware table
+  * Fix settings for scsi_id changes
+- Call mkinitrd_setup during %post and %postun (bnc#413709)
+
 -------------------------------------------------------------------
 Thu Aug 28 17:08:16 CEST 2008 - ro@suse.de

--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@ -27,12 +27,13 @@ Requires:       device-mapper kpartx
 PreReq:         %insserv_prereq %fillup_prereq coreutils grep diffutils
 AutoReqProv:    on
 Version:        0.4.8
-Release:        11
+Release:        14
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 Source:         multipath-tools-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch0:         %{name}-git-update
 Patch1:         %{name}-sles11-alpha1-update
+Patch2:         %{name}-sles11-alpha3-update

 %description
 This package provides the tools to manage multipathed devices by
@ -74,7 +75,8 @@ Authors:
 %prep
 %setup -n multipath-tools-%{version}
 %patch0 -p1
-%patch1  -p1
+%patch1 -p1
+%patch2 -p1

 %build
 make OPTFLAGS="$RPM_OPT_FLAGS"
@ -87,6 +89,8 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
 [ "$RPM_BUILD_ROOT" != / ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;

 %post
+[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
+exit 0
 #%{insserv /etc/init.d/multipathd}
 #%{fillup_and_insserv boot.multipath}

@ -94,6 +98,7 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
 %stop_on_removal multipathd

 %postun
+[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 %{insserv_cleanup}

 %files
@ -133,6 +138,12 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
 %{_mandir}/man8/kpartx.8*

 %changelog
+* Wed Sep 03 2008 hare@suse.de
+- Merge in fixes from upstream:
+  * Add IBM IPR to hardware table (bnc#419086)
+  * Add IBM DS4300 to hardware table
+  * Fix settings for scsi_id changes
+- Call mkinitrd_setup during %%post and %%postun (bnc#413709)
 * Thu Aug 28 2008 ro@suse.de
 - fix init scripts
 * Wed Jul 23 2008 hare@suse.de