Merge lp:~serge-hallyn/ubuntu/natty/multipath-tools/fix-uevent2 into lp:ubuntu/natty/multipath-tools

[Serge Hallyn]

Unmerged revisions

35. By Serge Hallyn on 2010-12-07

Add patch to fix uevent devpath handling. This is needed at least
from lucid..natty to work with the Intel Modular Server.

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-08 14:50:04 +0000
+++ debian/changelog	2010-12-07 20:41:48 +0000
@@ -1,3 +1,10 @@
+multipath-tools (0.4.8-14ubuntu5) natty; urgency=low
+
+  * Add patch to fix uevent devpath handling.  This is needed at least
+    from lucid..natty to work with the Intel Modular Server.
+
+ -- Serge Hallyn <[e-mail]>  Tue, 07 Dec 2010 14:10:13 -0600
+
 multipath-tools (0.4.8-14ubuntu4) lucid; urgency=low
 
   * debian/control: Move libreadline5-dev build dependency to libreadline-dev.

=== added file 'debian/patches/1002--Fix-for-uevent-devpath-handling.patch'
--- debian/patches/1002--Fix-for-uevent-devpath-handling.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/1002--Fix-for-uevent-devpath-handling.patch	2010-12-07 20:41:48 +0000
@@ -0,0 +1,39 @@
+Ubuntu: https://bugs.launchpad.net/ubuntu/+source/multipath-tools/+bug/520309
+Upstream: http://www.linux-archive.org/device-mapper-development/210372-fix-uevent-devpath-handling.html
+Description: Fix for uevent devpath handling
+ This is necessary to make uevents work on fedora, since devpath appears as
+ something like:
+ '/devices/pci0000:00/0000:00:0a.0/0000:06:00.0/host11/rport-11:0-1/target11:0:1/11:0:1:0/block/sdi'
+ It simply strips off the everything up to the /block.
+ Signed-off-by: Benjamin Marzinski <[e-mail]>
+ (Additionally squashed in two other trivial upstream fixes,
+ 15d4bdddcb9b71e0ec6fecc3c37a1b8cae8f51ff and
+ 27bdfc160a3ca96ade90b17291f25677fe2aaadf)
+
+Index: multipath-tools-fix/multipathd/main.c
+===================================================================
+--- multipath-tools-fix.orig/multipathd/main.c	2010-12-07 14:09:21.361201001 -0600
++++ multipath-tools-fix/multipathd/main.c	2010-12-07 14:09:51.011201001 -0600
+@@ -615,13 +615,19 @@
+ static int
+ uev_discard(char * devpath)
+ {
+-	char a[10], b[10];
++	char *tmp;
++	char a[11], b[11];
+ 
+ 	/*
+ 	 * keep only block devices, discard partitions
+ 	 */
+-	if (sscanf(devpath, "/block/%10s", a) != 1 ||
+-	    sscanf(devpath, "/block/%10[^/]/%10s", a, b) == 2) {
++	tmp = strstr(devpath, "/block/");
++	if (tmp == NULL){
++		condlog(4, "no /block/ in '%s'", devpath);
++		return 1;
++	}
++	if (sscanf(tmp, "/block/%10s", a) != 1 ||
++	    sscanf(tmp, "/block/%10[^/]/%10s", a, b) == 2) {
+ 		condlog(4, "discard event on %s", devpath);
+ 		return 1;
+ 	}

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-02-12 11:52:22 +0000
+++ debian/patches/series	2010-12-07 20:41:48 +0000
@@ -12,3 +12,4 @@
 0012--libmultipath-Update-discovery-to-work-with-new-sys.patch
 1000--set-umask-in-multipathd.patch
 1001--intel-mpath-prio-alua.patch
+1002--Fix-for-uevent-devpath-handling.patch