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
64 lines
1.8 KiB
Diff
64 lines
1.8 KiB
Diff
---
|
|
libmultipath/alias.c | 8 ++++++++
|
|
libmultipath/alias.h | 1 +
|
|
multipath/main.c | 7 ++++++-
|
|
3 files changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
Index: multipath-tools-130222/libmultipath/alias.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/alias.c
|
|
+++ multipath-tools-130222/libmultipath/alias.c
|
|
@@ -36,6 +36,14 @@
|
|
* See the file COPYING included with this distribution for more details.
|
|
*/
|
|
|
|
+int
|
|
+valid_alias(char *alias)
|
|
+{
|
|
+ if (strchr(alias, '/') != NULL)
|
|
+ return 0;
|
|
+ return 1;
|
|
+}
|
|
+
|
|
|
|
static int
|
|
format_devname(char *name, int id, int len, char *prefix)
|
|
Index: multipath-tools-130222/libmultipath/alias.h
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/alias.h
|
|
+++ multipath-tools-130222/libmultipath/alias.h
|
|
@@ -7,6 +7,7 @@
|
|
"# alias wwid\n" \
|
|
"#\n"
|
|
|
|
+int valid_alias(char *alias);
|
|
char *get_user_friendly_alias(char *wwid, char *file, char *prefix,
|
|
int bindings_readonly);
|
|
int get_user_friendly_wwid(char *alias, char *buff, char *file);
|
|
Index: multipath-tools-130222/multipath/main.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipath/main.c
|
|
+++ multipath-tools-130222/multipath/main.c
|
|
@@ -454,8 +454,9 @@ get_dev_type(char *dev) {
|
|
}
|
|
else if (sscanf(dev, "%d:%d", &i, &i) == 2)
|
|
return DEV_DEVT;
|
|
- else
|
|
+ else if (valid_alias(dev))
|
|
return DEV_DEVMAP;
|
|
+ return DEV_NONE;
|
|
}
|
|
|
|
int
|
|
@@ -607,6 +608,10 @@ main (int argc, char *argv[])
|
|
|
|
strncpy(conf->dev, argv[optind], FILE_NAME_SIZE);
|
|
conf->dev_type = get_dev_type(conf->dev);
|
|
+ if (conf->dev_type == DEV_NONE) {
|
|
+ condlog(0, "'%s' is not a valid argument\n", conf->dev);
|
|
+ goto out;
|
|
+ }
|
|
}
|
|
conf->daemon = 0;
|
|
|