help: print all options in abbreviated help output

Don't abbreviate the --help output quite as much
when there are many command defs.  Print all the
options in the cmd defs that are shown.  --longhelp
output is unchanged and includes everything.

diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index bb107d43b42ef34afc535cc8235c6c2acb11660b..280a052633ef3212fcc0758880b3c8d18c5c69d4 100644 (file)
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1835,15 +1835,13 @@ static int _usage(const char *name, int longhelp, int skip_notes)
                                 _cmdline.commands[i].command_enum,
                                 _cmdline.commands[i].command_id);
 
-               print_usage(&_cmdline.commands[i], show_full, 1);
+               print_usage(&_cmdline.commands[i], 1, 1);
                cmd = &_cmdline.commands[i];
        }
 
        /* Common options are printed once for all variants of a command name. */
-       if (show_full) {
-               print_usage_common_cmd(cname, cmd);
-               print_usage_common_lvm(cname, cmd);
-       }
+       print_usage_common_cmd(cname, cmd);
+       print_usage_common_lvm(cname, cmd);
 
        if (skip_notes)
                return 1;