From: christophe.varoqui@free.fr <christophe.varoqui@free.fr>
Date: Thu, 22 Jan 2004 08:16:28 +0000 (-0800)
Subject: [PATCH] udev-013/extras/multipath update
X-Git-Tag: 014~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=069bd530124afe40453a5530b8bfa17b1b39989a

[PATCH] udev-013/extras/multipath update

incremental to 0.0.13,

* update the DM target synthax to the 2.6.0-udm5 style
* update the changelog and the doc to reflect minimal requirements
---

diff --git a/extras/multipath/ChangeLog b/extras/multipath/ChangeLog
index a780865d3..bb2f6baf8 100644
--- a/extras/multipath/ChangeLog
+++ b/extras/multipath/ChangeLog
@@ -1,3 +1,5 @@
+2004-01-19 multipath-013
+	* update the DM target synthax to the 2.6.0-udm5 style
 2003-12-29 multipath-012
 	* check hotplug event refers to a block device; if not exit early
 	* refresh doc
diff --git a/extras/multipath/README b/extras/multipath/README
index 951c2788b..417a0d38e 100644
--- a/extras/multipath/README
+++ b/extras/multipath/README
@@ -4,8 +4,10 @@ Dependancies :
 o libdevmapper : comes with device-mapper-XXXX.tar.gz
   See www.sistina.com
   This lib has been dropped in the multipath tree
-o libsysfs : comes with sysutils
+o libsysfs : comes with sysutils or udev
   See ftp.kernel.org/pub/linux/utils/kernel/hotplug/
+o Linux kernel 2.6.0 with udm5 patchset
+  http://people.sistina.com/~thornber/dm/
 
 How it works :
 ==============
diff --git a/extras/multipath/main.c b/extras/multipath/main.c
index a8e29e8ba..e18e04912 100644
--- a/extras/multipath/main.c
+++ b/extras/multipath/main.c
@@ -665,7 +665,7 @@ setup_map(struct env * conf, struct path * all_paths,
 
 	if (all_paths[PINDEX(index,0)].iopolicy == MULTIBUS &&
 	    !conf->forcedfailover ) {
-		params_p += sprintf(params_p, " %i %s %i %i",
+		params_p += sprintf(params_p, " 1 %i %s %i %i",
 				    dm_pg_prio, dm_ps_name, np, dm_ps_nr_args);
 		
 		for (i=0; i<=mp[index].npaths; i++) {
@@ -678,6 +678,7 @@ setup_map(struct env * conf, struct path * all_paths,
 
 	if (all_paths[PINDEX(index,0)].iopolicy == FAILOVER ||
 	    conf->forcedfailover) {
+		params_p += sprintf(params_p, " %i", mp[index].npaths + 1);
 		for (i=0; i<=mp[index].npaths; i++) {
 			if (0 != all_paths[PINDEX(index,i)].sg_id.scsi_type)
 				continue;