Blame SOURCES/0008-RH-revert-partition-changes.patch

f20720
---
f20720
 kpartx/dos.c    |    2 --
f20720
 kpartx/kpartx.c |    9 ++++++---
f20720
 2 files changed, 6 insertions(+), 5 deletions(-)
f20720
f20720
Index: multipath-tools-130222/kpartx/dos.c
f20720
===================================================================
f20720
--- multipath-tools-130222.orig/kpartx/dos.c
f20720
+++ multipath-tools-130222/kpartx/dos.c
f20720
@@ -98,8 +98,6 @@ read_dos_pt(int fd, struct slice all, st
f20720
 			break;
f20720
 		}
f20720
 		if (is_extended(p.sys_type)) {
f20720
-			sp[i].size = 2; /* extended partitions only get two
f20720
-					   sectors mapped for LILO to install */
f20720
 			n += read_extended_partition(fd, &p, i, sp+n, ns-n);
f20720
 		}
f20720
 	}
f20720
Index: multipath-tools-130222/kpartx/kpartx.c
f20720
===================================================================
f20720
--- multipath-tools-130222.orig/kpartx/kpartx.c
f20720
+++ multipath-tools-130222/kpartx/kpartx.c
f20720
@@ -516,6 +516,7 @@ main(int argc, char **argv){
f20720
 			d = c;
f20720
 			while (c) {
f20720
 				for (j = 0; j < n; j++) {
f20720
+					uint64_t start;
f20720
 					int k = slices[j].container - 1;
f20720
 
f20720
 					if (slices[j].size == 0)
f20720
@@ -541,9 +542,11 @@ main(int argc, char **argv){
f20720
 					}
f20720
 					strip_slash(partname);
f20720
 
f20720
-					if (safe_sprintf(params, "%s %" PRIu64,
f20720
-							 device,
f20720
-							 slices[j].start)) {
f20720
+					start = slices[j].start - slices[k].start;
f20720
+					if (safe_sprintf(params, "%d:%d %" PRIu64,
f20720
+							 slices[k].major,
f20720
+							 slices[k].minor,
f20720
+							 start)) {
f20720
 						fprintf(stderr, "params too small\n");
f20720
 						exit(1);
f20720
 					}