[Pkg-iscsi-maintainers] [open-iscsi] 18/33: Allow firmware mode to use debug flag

[Ritesh Raj Sarraf]

This is an automated email from the git hooks/post-receive script.

rrs pushed a commit to branch upstream-mnc
in repository open-iscsi.

commit 6674fd4cf43d5fd2ce5a666e5172865e8d61d559
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Mon May 13 03:19:54 2013 -0500

    Allow firmware mode to use debug flag
    
    From Lee Duncan:
    
    When iscsiadm is called with "-m fw", the debug flag can be
    useful.
    
    Signed-off-by: Hannes Reinecke <hare at suse.com>
    Signed-off-by: Lee Duncan <lduncan at suse.com>
---
 doc/iscsiadm.8 |    2 +-
 usr/iscsiadm.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/iscsiadm.8 b/doc/iscsiadm.8
index b4c7388..6b15fcd 100644
--- a/doc/iscsiadm.8
+++ b/doc/iscsiadm.8
@@ -14,7 +14,7 @@ iscsiadm \- open-iscsi administration utility
 
 \fBiscsiadm\fR \-m iface [ \-hV ] [ \-d debug_level ] [ \-P printlevel ] [ \-I ifacename | \-H hostno|MAC ]   [ [ \-o  operation  ] [ \-n name ] [ \-v value ] ] [ \-C ping [ \-a ip ] [ \-b packetsize ] [ \-c count ] [ \-i interval ] ]
 
-\fBiscsiadm\fR \-m fw [\-l]
+\fBiscsiadm\fR \-m fw [ \-d debug_level ] [\-l]
 
 \fBiscsiadm\fR \-m host [ \-P printlevel ] [ \-H hostno|MAC ] [ [ \-C chap [ \-o operation ] [ \-v chap_tbl_idx ] ] | [ \-C flashnode [ \-o operation ] [ \-A portal_type ] [ \-x flashnode_idx ] [ \-n name ] [ \-v value ] ] ]
 
diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
index 5a18522..df76df9 100644
--- a/usr/iscsiadm.c
+++ b/usr/iscsiadm.c
@@ -135,7 +135,7 @@ iscsiadm -m node [ -hV ] [ -d debug_level ] [ -P printlevel ] [ -L all,manual,au
 [ [ -o  operation  ] [ -n name ] [ -v value ] ]\n\
 iscsiadm -m session [ -hV ] [ -d debug_level ] [ -P  printlevel] [ -r sessionid | sysfsdir [ -R | -u | -s ] [ -o operation ] [ -n name ] [ -v value ] ]\n\
 iscsiadm -m iface [ -hV ] [ -d debug_level ] [ -P printlevel ] [ -I ifacename | -H hostno|MAC ] [ [ -o  operation  ] [ -n name ] [ -v value ] ] [ -C ping [ -a ip ] [ -b packetsize ] [ -c count ] [ -i interval ] ]\n\
-iscsiadm -m fw [ -l ]\n\
+iscsiadm -m fw [ -d debug_level ] [ -l ]\n\
 iscsiadm -m host [ -P printlevel ] [ -H hostno|MAC ] [ [ -C chap [ -o operation ] [ -v chap_tbl_idx ] ] | [ -C flashnode [ -o operation ] [ -A portal_type ] [ -x flashnode_idx ] [ -n name ] [ -v value ] ] ]\n\
 iscsiadm -k priority\n");
 	}
@@ -2987,7 +2987,7 @@ main(int argc, char **argv)
 		usage(ISCSI_ERR_INVAL);
 
 	if (mode == MODE_FW) {
-		if ((rc = verify_mode_params(argc, argv, "ml", 0))) {
+		if ((rc = verify_mode_params(argc, argv, "dml", 0))) {
 			log_error("fw mode: option '-%c' is not "
 				  "allowed/supported", rc);
 			rc = ISCSI_ERR_INVAL;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-iscsi/open-iscsi.git