d1207a7795
Updated to latest upstrem 0.4.9 code: multipath-tools-130222
(git commit id: 67b82ad6fe280caa1770025a6bb8110b633fa136)
Refresh 0001-RH-dont_start_with_no_config.patch
Modify 0002-RH-multipath.rules.patch
Modify 0003-RH-Make-build-system-RH-Fedora-friendly.patch
Refresh 0004-RH-multipathd-blacklist-all-by-default.patch
Refresh 0005-RH-add-mpathconf.patch
Refresh 0006-RH-add-find-multipaths.patch
Add 0008-RH-revert-partition-changes.patch
Rename 0008-RH-RHEL5-style-partitions.patch to
0009-RH-RHEL5-style-partitions.patch
Rename 0009-RH-dont-remove-map-on-enomem.patch to
0010-RH-dont-remove-map-on-enomem.patch
Rename 0010-RH-deprecate-uid-gid-mode.patch to
0011-RH-deprecate-uid-gid-mode.patch
Rename 0013-RH-kpartx-msg.patch to 0012-RH-kpartx-msg.patch
Rename 0035-RHBZ-883981-cleanup-rpmdiff-issues.patch to
0013-RHBZ-883981-cleanup-rpmdiff-issues.patch
Rename 0039-RH-handle-other-sector-sizes.patch to
0014-RH-handle-other-sector-sizes.patch
Rename 0040-RH-fix-output-buffer.patch to 0015-RH-fix-output-buffer.patch
Add 0016-RH-dont-print-ghost-messages.patch
Add 0017-RH-fix-sigusr1.patch
* Actually this fixes a number of issues related to signals
Rename 0018-RH-remove-config-dups.patch to 0018-RH-fix-factorize.patch
* just the part that isn't upstream
Add 0019-RH-fix-sockets.patch
* makes abstract multipathd a cli sockets use the correct name.
Set find_multipaths in the default config
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
---
|
|
kpartx/dos.c | 2 --
|
|
kpartx/kpartx.c | 9 ++++++---
|
|
2 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
Index: multipath-tools-130222/kpartx/dos.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/kpartx/dos.c
|
|
+++ multipath-tools-130222/kpartx/dos.c
|
|
@@ -98,8 +98,6 @@ read_dos_pt(int fd, struct slice all, st
|
|
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);
|
|
}
|
|
}
|
|
Index: multipath-tools-130222/kpartx/kpartx.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/kpartx/kpartx.c
|
|
+++ multipath-tools-130222/kpartx/kpartx.c
|
|
@@ -516,6 +516,7 @@ main(int argc, char **argv){
|
|
d = c;
|
|
while (c) {
|
|
for (j = 0; j < n; j++) {
|
|
+ uint64_t start;
|
|
int k = slices[j].container - 1;
|
|
|
|
if (slices[j].size == 0)
|
|
@@ -541,9 +542,11 @@ main(int argc, char **argv){
|
|
}
|
|
strip_slash(partname);
|
|
|
|
- if (safe_sprintf(params, "%s %" PRIu64,
|
|
- device,
|
|
- slices[j].start)) {
|
|
+ start = slices[j].start - slices[k].start;
|
|
+ if (safe_sprintf(params, "%d:%d %" PRIu64,
|
|
+ slices[k].major,
|
|
+ slices[k].minor,
|
|
+ start)) {
|
|
fprintf(stderr, "params too small\n");
|
|
exit(1);
|
|
}
|