6738b34a0b
- Modify 0005-RH-add-mpathconf.patch
* changed warning message
- Modify 0102-RHBZ-1160478-mpathconf-template.patch
* updated man page
- Modify 0104-RHBZ-631009-deferred-remove.patch
* refactor code and minor fix
- Refresh 0107-RHBZ-1169935-no-new-devs.patch
- Refresh 0112-RHBZ-1194917-add-config_dir-option.patch
- Refresh 0126-RHBZ-1211383-alias-collision.patch
- Add 0133-RHBZ-1296979-fix-define.patch
* look for the correct libudev function to set define
- Add 0134-RHBZ-1241528-check-mpath-prefix.patch
* only touch devices with a "mpath-" dm uuid prefix
- Add 0135-RHBZ-1299600-path-dev-uevents.patch
* trigger path uevent the first time a path is claimed by multipath
- Add 0136-RHBZ-1304687-wait-for-map-add.patch
* wait for the device to finish being added before reloading it.
- Add 0137-RHBZ-1280524-clear-chkr-msg.patch
- Add 0138-RHBZ-1288660-fix-mpathconf-allow.patch
* don't remove existing lines from blacklist_exceptions section
- Add 0139-RHBZ-1273173-queue-no-daemon-doc.patch
- Add 0140-RHBZ-1299647-fix-help.patch
- Add 0141-RHBZ-1303953-mpathpersist-typo.patch
- Add 0142-RHBZ-1283750-kpartx-fix.patch
* only remove devices if their uuid says that they are the correct
partition device
- Add 0143-RHBZ-1299648-kpartx-sync.patch
* default to using udev sync mode
- Add 0144-RHBZ-1299652-alua-pref-arg.patch
* allow "exclusive_pref_bit" argument to alua prioritizer
- Add 0145-UP-resize-help-msg.patch
- Add 0146-UPBZ-1299651-raw-output.patch
* allow raw format mutipathd show commands, that remove headers and padding
- Add 0147-RHBZ-1272620-fail-rm-msg.patch
- Add 0148-RHBZ-1292599-verify-before-remove.patch
* verify that all partitions are unused before attempting to remove a device
- Add 0149-RHBZ-1292599-restore-removed-parts.patch
* don't disable kpartx when restoring the first path of a device.
- Add 0150-RHBZ-1253913-fix-startup-msg.patch
* wait for multipathd daemon to write pidfile before returning
- Add 0151-RHBZ-1297456-weighted-fix.patch
* add wwn keyword to weighted prioritizer for persistent naming
- Add 0152-RHBZ-1269293-fix-blk-unit-file.patch
* use "Wants" instead of "Requires"
- Add 0153-RH-fix-i686-size-bug.patch
* use 64-bit keycodes for multipathd client commands
- Add 0154-UPBZ-1291406-disable-reinstate.patch
* don't automatically reinstate ghost paths for implicit alua devices
- Add 0155-UPBZ-1300415-PURE-config.patch
* Add default config for PURE FlashArray
- Add 0156-UPBZ-1313324-dont-fail-discovery.patch
* don't fail discovery because individual paths failed.
- Add 0157-RHBZ-1319853-multipath-c-error-msg.patch
* better error reporting for multipath -c
- Add 0158-RHBZ-1318581-timestamp-doc-fix.patch
* add documentation for -T
- Add 0159-UPBZ-1255885-udev-waits.patch
* make multipath and kpartx wait after for udev after each command
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
---
|
|
kpartx/kpartx.c | 10 +++++++---
|
|
multipath/multipath.rules | 2 +-
|
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
Index: multipath-tools-130222/kpartx/kpartx.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/kpartx/kpartx.c
|
|
+++ multipath-tools-130222/kpartx/kpartx.c
|
|
@@ -57,7 +57,7 @@ struct pt {
|
|
} pts[MAXTYPES];
|
|
|
|
int ptct = 0;
|
|
-int udev_sync = 0;
|
|
+int udev_sync = 1;
|
|
|
|
static void
|
|
addpts(char *t, ptreader f)
|
|
@@ -85,7 +85,7 @@ initpts(void)
|
|
addpts("ps3", read_ps3_pt);
|
|
}
|
|
|
|
-static char short_opts[] = "rladfgvp:t:su";
|
|
+static char short_opts[] = "rladfgvp:t:snu";
|
|
|
|
/* Used in gpt.c */
|
|
int force_gpt=0;
|
|
@@ -104,7 +104,8 @@ usage(void) {
|
|
printf("\t-g force GUID partition table (GPT)\n");
|
|
printf("\t-f force devmap create\n");
|
|
printf("\t-v verbose\n");
|
|
- printf("\t-s sync mode. Don't return until the partitions are created\n");
|
|
+ printf("\t-n nosync mode. Return before the partitions are created\n");
|
|
+ printf("\t-s sync mode. Don't return until the partitions are created. Default.\n");
|
|
return 1;
|
|
}
|
|
|
|
@@ -285,6 +286,9 @@ main(int argc, char **argv){
|
|
case 's':
|
|
udev_sync = 1;
|
|
break;
|
|
+ case 'n':
|
|
+ udev_sync = 0;
|
|
+ break;
|
|
case 'u':
|
|
what = UPDATE;
|
|
break;
|
|
Index: multipath-tools-130222/multipath/multipath.rules
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipath/multipath.rules
|
|
+++ multipath-tools-130222/multipath/multipath.rules
|
|
@@ -48,6 +48,6 @@ ENV{DM_ACTIVATION}=="1", ENV{DM_MULTIPAT
|
|
ENV{DM_SUSPENDED}=="1", GOTO="end_mpath"
|
|
ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath"
|
|
ENV{DM_ACTIVATION}!="1", ENV{DM_MULTIPATH_NEED_KPARTX}!="1", GOTO="end_mpath"
|
|
-RUN+="$env{MPATH_SBIN_PATH}/kpartx -a $tempnode", \
|
|
+RUN+="$env{MPATH_SBIN_PATH}/kpartx -an $tempnode", \
|
|
ENV{DM_MULTIPATH_NEED_KPARTX}=""
|
|
LABEL="end_mpath"
|