shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-26 17:25:10 +03:00
Code Releases Activity

blkdeactivate: fix --{dm,lvm,mpath}options option name recognition

Browse Source 
There was a typo in blkdeactivate --dmoption/--lvmoption/mpathoption,
it had missing "s" at the end and it was not recognized properly, only
short names for the options (-d/-l/-m).
This commit is contained in:
Peter Rajnoha 2017-09-21 17:03:42 +02:00
parent 0ab9e4b6a7
commit 9f34125d5d
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.144 - Version 1.02.144 -
====================================== ======================================
Fix typo in blkdeactivate's '--{dm,lvm,mpath}options' option name.
Correct return value testing when get reserved values for reporting. Correct return value testing when get reserved values for reporting.
Take -S with dmsetup suspend/resume/clear/wipe_table/remove/deps/status/table. Take -S with dmsetup suspend/resume/clear/wipe_table/remove/deps/status/table.

6
man/blkdeactivate.8_main
View File

@ -22,7 +22,7 @@ based devices are handled using the \fBdmsetup\fP(8) command.
MD devices are handled using the \fBmdadm\fP(8) command. MD devices are handled using the \fBmdadm\fP(8) command.
.SH OPTIONS .SH OPTIONS
.TP .TP
.BR -d ", " --dmoption \ \fIdm_options\fP .BR -d ", " --dmoptions \ \fIdm_options\fP
Comma separated list of device-mapper specific options. Comma separated list of device-mapper specific options.
Accepted \fBdmsetup\fP(8) options are: Accepted \fBdmsetup\fP(8) options are:
.RS .RS
@ -41,7 +41,7 @@ the device was skipped.
.BR -h ", " --help .BR -h ", " --help
Display the help text. Display the help text.
.TP .TP
.BR -l ", " --lvmoption \ \fIlvm_options\fP .BR -l ", " --lvmoptions \ \fIlvm_options\fP
Comma-separated list of LVM specific options: Comma-separated list of LVM specific options:
.RS .RS
.IP \fIretry\fP .IP \fIretry\fP
@ -52,7 +52,7 @@ Deactivating the Volume Group as a whole is quicker than deactivating
each Logical Volume separately. each Logical Volume separately.
.RE .RE
.TP .TP
.BR -m ", " --mpathoption \ \fImpath_options\fP .BR -m ", " --mpathoptions \ \fImpath_options\fP
Comma-separated list of device-mapper multipath specific options: Comma-separated list of device-mapper multipath specific options:
.RS .RS
.IP \fIdisablequeueing\fP .IP \fIdisablequeueing\fP

20
scripts/blkdeactivate.sh.in
View File

@ -113,13 +113,13 @@ usage() {
echo " If devices are specified, deactivate only supplied devices and their holders." echo " If devices are specified, deactivate only supplied devices and their holders."
echo echo
echo " Options:" echo " Options:"
echo " -e | --errors Show errors reported from tools" echo " -e | --errors Show errors reported from tools"
echo " -h | --help Show this help message" echo " -h | --help Show this help message"
echo " -d | --dmoption DM_OPTIONS Comma separated DM specific options" echo " -d | --dmoptions DM_OPTIONS Comma separated DM specific options"
echo " -l | --lvmoption LVM_OPTIONS Comma separated LVM specific options" echo " -l | --lvmoptions LVM_OPTIONS Comma separated LVM specific options"
echo " -m | --mpathoption MPATH_OPTIONS Comma separated DM-multipath specific options" echo " -m | --mpathoptions MPATH_OPTIONS Comma separated DM-multipath specific options"
echo " -u | --umount Unmount the device if mounted" echo " -u | --umount Unmount the device if mounted"
echo " -v | --verbose Verbose mode (also implies -e)" echo " -v | --verbose Verbose mode (also implies -e)"
echo echo
echo " Device specific options:" echo " Device specific options:"
echo " DM_OPTIONS:" echo " DM_OPTIONS:"
@ -490,9 +490,9 @@ while test $# -ne 0; do
"") ;; "") ;;
"-e"|"--errors") ERRORS=1 ;; "-e"|"--errors") ERRORS=1 ;;
"-h"|"--help") usage ;; "-h"|"--help") usage ;;
"-d"|"--dmoption ") get_dmopts "$2" ; shift ;; "-d"|"--dmoptions") get_dmopts "$2" ; shift ;;
"-l"|"--lvmoption ") get_lvmopts "$2" ; shift ;; "-l"|"--lvmoptions") get_lvmopts "$2" ; shift ;;
"-m"|"--mpathoption ") get_mpathopts "$2" ; shift ;; "-m"|"--mpathoptions") get_mpathopts "$2" ; shift ;;
"-u"|"--umount") DO_UMOUNT=1 ;; "-u"|"--umount") DO_UMOUNT=1 ;;
"-v"|"--verbose") VERBOSE=1 ; ERRORS=1 ;; "-v"|"--verbose") VERBOSE=1 ; ERRORS=1 ;;
"-vv") VERBOSE=1 ; ERRORS=1 ; set -x ;; "-vv") VERBOSE=1 ; ERRORS=1 ; set -x ;;