Blob Blame History Raw
diff -uNr a/fence/agents/mpath/fence_mpath.py b/fence/agents/mpath/fence_mpath.py
--- a/fence/agents/mpath/fence_mpath.py	2016-05-25 12:41:55.491900397 +0200
+++ b/fence/agents/mpath/fence_mpath.py	2016-05-25 12:42:37.704454037 +0200
@@ -169,7 +169,7 @@
 		"help" : "-d, --devices=[devices]        List of devices to use for current operation",
 		"required" : "0",
 		"shortdesc" : "List of devices to use for current operation. Devices can \
-be comma-separated list of device-mapper multipath devices (eg. /dev/dm-3). \
+be comma-separated list of device-mapper multipath devices (eg. /dev/mapper/3600508b400105df70000e00000ac0000 or /dev/mapper/mpath1). \
 Each device must support SCSI-3 persistent reservations.",
 		"order": 1
 	}
diff -uNr a/fence/agents/scsi/fence_scsi.py b/fence/agents/scsi/fence_scsi.py
--- a/fence/agents/scsi/fence_scsi.py	2016-05-25 12:41:55.517900122 +0200
+++ b/fence/agents/scsi/fence_scsi.py	2016-05-25 12:42:37.704454037 +0200
@@ -291,8 +291,8 @@
 		"help" : "-d, --devices=[devices]        List of devices to use for current operation",
 		"required" : "0",
 		"shortdesc" : "List of devices to use for current operation. Devices can \
-be comma-separated list of raw device (eg. /dev/sdc) or device-mapper multipath \
-devices (eg. /dev/dm-3). Each device must support SCSI-3 persistent reservations.",
+be comma-separated list of raw devices (eg. /dev/sdc). Each device must support SCSI-3 \
+persistent reservations.",
 		"order": 1
 	}
 	all_opt["nodename"] = {
diff -uNr a/tests/data/metadata/fence_mpath.xml b/tests/data/metadata/fence_mpath.xml
--- a/tests/data/metadata/fence_mpath.xml	2016-05-25 12:41:55.486900450 +0200
+++ b/tests/data/metadata/fence_mpath.xml	2016-05-25 12:42:37.704454037 +0200
@@ -7,7 +7,7 @@
 	<parameter name="devices" unique="0" required="0">
 		<getopt mixed="-d, --devices=[devices]" />
 		<content type="string"  />
-		<shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of device-mapper multipath devices (eg. /dev/dm-3). Each device must support SCSI-3 persistent reservations.</shortdesc>
+		<shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of device-mapper multipath devices (eg. /dev/mapper/3600508b400105df70000e00000ac0000 or /dev/mapper/mpath1). Each device must support SCSI-3 persistent reservations.</shortdesc>
 	</parameter>
 	<parameter name="key" unique="0" required="1">
 		<getopt mixed="-k, --key=[key]" />
diff -uNr a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml
--- a/tests/data/metadata/fence_scsi.xml	2016-05-25 12:41:55.517900122 +0200
+++ b/tests/data/metadata/fence_scsi.xml	2016-05-25 12:42:37.704454037 +0200
@@ -27,7 +27,7 @@
 	<parameter name="devices" unique="0" required="0">
 		<getopt mixed="-d, --devices=[devices]" />
 		<content type="string"  />
-		<shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of raw device (eg. /dev/sdc) or device-mapper multipath devices (eg. /dev/dm-3). Each device must support SCSI-3 persistent reservations.</shortdesc>
+		<shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of raw devices (eg. /dev/sdc). Each device must support SCSI-3 persistent reservations.</shortdesc>
 	</parameter>
 	<parameter name="logfile" unique="0" required="0">
 		<getopt mixed="-a, --logfile" />