Merge lp:~psusi/ubuntu/precise/multipath-tools/fix-dmraid-extended-partitions into lp:ubuntu/precise/multipath-tools

[Phillip Susi]

[Stefan Bader (smb)]

Clean cherry-pick from Saucy. Looks correct to me.

review: Approve

[Iain Lane (laney)]

Merci, uploaded

review: Approve

[Dimitri John Ledkov (xnox)]

setting to merged, to remove from sponsorship report. The package is still in precise unapproved queue.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-01-09 04:04:07 +0000
+++ .pc/applied-patches	2013-05-28 15:25:36 +0000
@@ -9,3 +9,4 @@
 1000--set-umask-in-multipathd.patch
 1001--fix-linking-command.patch
 0009-fix-delim.patch
+0010-fix-extended-partitions.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-20 15:26:22 +0000
+++ debian/changelog	2013-05-28 15:25:36 +0000
@@ -1,3 +1,10 @@
+multipath-tools (0.4.9-3ubuntu5.1) precise; urgency=low
+
+  * Add 0010-fix-extended-partitions.patch: Only expose the
+    first two sectors of the extended partition (LP: #1093918).
+
+ -- Phillip Susi <[e-mail]>  Tue, 28 May 2013 11:14:46 -0400
+
 multipath-tools (0.4.9-3ubuntu5) precise; urgency=low
 
   * Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874)

=== added file 'debian/patches/0010-fix-extended-partitions.patch'
--- debian/patches/0010-fix-extended-partitions.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0010-fix-extended-partitions.patch	2013-05-28 15:25:36 +0000
@@ -0,0 +1,47 @@
+From: Phillip Susi <[e-mail]>
+Subject: fix extended partition mapping
+Description: The linux kernel maps the extended partition only
+ so that LILO can be installed there.  The length is always set
+ to two sectors to allow this, and most tools know to ignore the
+ device.  kpartx was mapping the entire extended partition, then
+ stacking the logical partitions on top of it.  This presented
+ a device that looked like an entirely separate disk that
+ contains only the logical partitions.  This patch fixes kpartx
+ to conform with the normal Linux behavior.
+
+--- a/kpartx/dos.c
++++ b/kpartx/dos.c
+@@ -98,6 +98,8 @@
+ 			break;
+ 		}
+ 		if (is_extended(p.sys_type)) {
++			sp[i].size = 2; /* extended partitions only get two
++					   sectors mapped for LILO to install */
+ 			n += read_extended_partition(fd, &p, i, sp+n, ns-n);
+ 		}
+ 	}
+--- a/kpartx/kpartx.c
++++ b/kpartx/kpartx.c
+@@ -501,7 +501,6 @@
+ 			d = c;
+ 			while (c) {
+ 				for (j = 0; j < n; j++) {
+-					uint64_t start;
+ 					int k = slices[j].container - 1;
+ 
+ 					if (slices[j].size == 0)
+@@ -527,11 +526,9 @@
+ 					}
+ 					strip_slash(partname);
+ 
+-					start = slices[j].start - slices[k].start;
+-					if (safe_sprintf(params, "%d:%d %" PRIu64,
+-							 slices[k].major,
+-							 slices[k].minor,
+-							 start)) {
++					if (safe_sprintf(params, "%s %" PRIu64,
++							 device,
++							 slices[j].start)) {
+ 						fprintf(stderr, "params too small\n");
+ 						exit(1);
+ 					}

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-01-09 04:04:07 +0000
+++ debian/patches/series	2013-05-28 15:25:36 +0000
@@ -9,3 +9,4 @@
 1000--set-umask-in-multipathd.patch
 1001--fix-linking-command.patch
 0009-fix-delim.patch
+0010-fix-extended-partitions.patch

=== modified file 'kpartx/dos.c'
--- kpartx/dos.c	2009-02-12 15:07:42 +0000
+++ kpartx/dos.c	2013-05-28 15:25:36 +0000
@@ -98,6 +98,8 @@
 			break;
 		}
 		if (is_extended(p.sys_type)) {
+			sp[i].size = 2; /* extended partitions only get two
+					   sectors mapped for LILO to install */
 			n += read_extended_partition(fd, &p, i, sp+n, ns-n);
 		}
 	}

=== modified file 'kpartx/kpartx.c'
--- kpartx/kpartx.c	2012-01-09 04:04:07 +0000
+++ kpartx/kpartx.c	2013-05-28 15:25:36 +0000
@@ -501,7 +501,6 @@
 			d = c;
 			while (c) {
 				for (j = 0; j < n; j++) {
-					uint64_t start;
 					int k = slices[j].container - 1;
 
 					if (slices[j].size == 0)
@@ -527,11 +526,9 @@
 					}
 					strip_slash(partname);
 
-					start = slices[j].start - slices[k].start;
-					if (safe_sprintf(params, "%d:%d %" PRIu64,
-							 slices[k].major,
-							 slices[k].minor,
-							 start)) {
+					if (safe_sprintf(params, "%s %" PRIu64,
+							 device,
+							 slices[j].start)) {
 						fprintf(stderr, "params too small\n");
 						exit(1);
 					}