tools: enhance lvdisplay vgdisplay pvdisplay

Split description for display commands so we can better describe
it's usage and combination of individual options in man page.

Now we can separately describe:

lvdisplay, lvdisplay -c, lvdisplay -C
vgdisplay, vgdisplay -c, vgdisplay -C
pvdisplay, pvdisplay -c, pvdisplay -C

TODO: Drop validation from command code itself.

diff --git a/tools/command-lines.in b/tools/command-lines.in
index ada6b2c38b8a76d1017be0f8df2f19d3d144e68f..9820a6bc1dfbd5044220e595d64d3d62c5b7c822 100644 (file)
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -206,15 +206,20 @@ OO_ALL: --commandprofile String, --config String, --debug,
 --driverloaded Bool, --help, --nolocking, --lockopt String, --longhelp, --profile String, --quiet,
 --verbose, --version, --yes, --test, --devicesfile String, --devices PV, --nohints --journal String
 
+#
+# options for pvdisplay, lvdisplay, vgdisplay
+#
+OO_REPORTING: --all, --configreport ConfigReport, --foreign,
+--ignorelockingfailure, --logonly, --readonly, --reportformat ReportFmt,
+--select String, --shared, --sort String, --units Units
+
 #
 # options for pvs, lvs, vgs, fullreport
 #
-OO_REPORT: --aligned, --all, --binary, --configreport ConfigReport, --foreign,
---headings HeadingsType --ignorelockingfailure, --logonly,
---nameprefixes, --noheadings, --nosuffix,
---options String, --readonly, --reportformat ReportFmt, --rows,
---select String, --separator String, --shared, --sort String,
---unbuffered, --units Units, --unquoted
+OO_REPORT: OO_REPORTING, --aligned, --binary,
+--headings HeadingsType, --nameprefixes, --noheadings,
+--nosuffix, --options String, --rows, --separator String,
+--unbuffered, --unquoted
 
 #
 # options for config, dumpconfig, lvmconfig
@@ -1386,15 +1391,23 @@ DESC: new LV to type writecache.
 
 ---
 
+lvdisplay --columns
+OO: OO_REPORT, --history, --segments
+OP: VG|LV|Tag ...
+IO: --partial, --ignoreskippedcluster
+RULE: --noheadings not --headings
+ID: lvdisplay_columns
+
+lvdisplay --colon
+OO: OO_REPORTING, --history, --segments
+OP: VG|LV|Tag ...
+IO: --partial, --ignoreskippedcluster
+ID: lvdisplay_colon
+
 lvdisplay
-OO: --aligned, --all, --binary, --colon, --columns,
---configreport ConfigReport, --foreign, --history, --ignorelockingfailure,
---logonly, --maps, --noheadings,
---nosuffix, --options String, --sort String, --readonly,
---segments, --select String, --separator String,
---shared, --unbuffered, --units Units
+OO: OO_REPORTING, --history, --segments, --maps
 OP: VG|LV|Tag ...
-IO: --partial, --ignoreskippedcluster, --reportformat ReportFmt
+IO: --partial, --ignoreskippedcluster
 ID: lvdisplay_general
 
 ---
@@ -1622,14 +1635,23 @@ RULE: --bootloaderareasize not --restorefile
 
 ---
 
+pvdisplay --columns
+OO: OO_REPORT, --segments
+OP: PV|Tag ...
+IO: --partial, --ignoreskippedcluster
+RULE: --noheadings not --headings
+ID: pvdisplay_columns
+
+pvdisplay --colon
+OO: OO_REPORTING, --segments
+OP: PV|Tag ...
+IO: --partial, --ignoreskippedcluster
+ID: pvdisplay_colon
+
 pvdisplay
-OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport,
---foreign, --ignorelockingfailure,
---logonly, --maps, --noheadings, --nosuffix, --options String,
---readonly, --reportformat ReportFmt, --select String, --separator String, --shared,
---short, --sort String, --unbuffered, --units Units
+OO: OO_REPORTING, --maps, --segments, --short
 OP: PV|Tag ...
-IO: --ignoreskippedcluster
+IO: --partial, --ignoreskippedcluster
 ID: pvdisplay_general
 
 ---
@@ -1845,14 +1867,23 @@ ID: vgcreate_general
 
 ---
 
+vgdisplay --columns
+OO: OO_REPORT, --activevolumegroups
+OP: VG|Tag ...
+IO: --partial, --ignoreskippedcluster
+RULE: --noheadings not --headings
+ID: vgdisplay_columns
+
+vgdisplay --colon
+OO: OO_REPORTING, --activevolumegroups
+OP: VG|Tag ...
+IO: --partial, --ignoreskippedcluster
+ID: vgdisplay_colon
+
 vgdisplay
-OO: --activevolumegroups, --aligned, --binary, --colon, --columns,
---configreport ConfigReport, --foreign, --ignorelockingfailure,
---logonly, --noheadings, --nosuffix,
---options String, --readonly, --select String,
---shared, --short, --separator String, --sort String, --unbuffered, --units Units
+OO: OO_REPORTING, --activevolumegroups, --short
 OP: VG|Tag ...
-IO: --partial, --ignoreskippedcluster, --reportformat ReportFmt
+IO: --partial, --ignoreskippedcluster
 ID: vgdisplay_general
 
 ---

diff --git a/tools/lvdisplay.c b/tools/lvdisplay.c
index b8c4b461a1c7e938336f7bf00da7e86b5e9f4c69..1e26abe3764993610bfc6908e995d9165f4b6709 100644 (file)
--- a/tools/lvdisplay.c
+++ b/tools/lvdisplay.c
@@ -60,3 +60,13 @@ int lvdisplay(struct cmd_context *cmd, int argc, char **argv)
 
        return process_each_lv(cmd, argc, argv, NULL, NULL, 0, NULL, NULL, &_lvdisplay_single);
 }
+
+int lvdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+       return lvdisplay(cmd, argc, argv);
+}
+
+int lvdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+       return lvdisplay(cmd, argc, argv);
+}

diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 7209ebd9b3c26664d302aa227b6b6b5a6a28b4af..dee8933fdd2dd98c8dc52f5a35aeb2e1f8ad485c 100644 (file)
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -88,6 +88,18 @@ static const struct command_function _command_functions[CMD_COUNT] = {
        { vgchange_lockstop_CMD, vgchange_lock_start_stop_cmd },
        { vgchange_systemid_CMD, vgchange_systemid_cmd },
 
+       /* lvdisplay variants */
+       { lvdisplay_columns_CMD,        lvdisplay_columns_cmd },
+       { lvdisplay_colon_CMD,          lvdisplay_colon_cmd },
+
+       /* pvdisplay variants */
+       { pvdisplay_columns_CMD,        pvdisplay_columns_cmd },
+       { pvdisplay_colon_CMD,          pvdisplay_colon_cmd },
+
+       /* vgdisplay variants */
+       { vgdisplay_columns_CMD,        vgdisplay_columns_cmd },
+       { vgdisplay_colon_CMD,          vgdisplay_colon_cmd },
+
        /* lvconvert utilities related to repair. */
        { lvconvert_repair_CMD, lvconvert_repair_cmd },
        { lvconvert_replace_pv_CMD, lvconvert_replace_pv_cmd },

diff --git a/tools/pvdisplay.c b/tools/pvdisplay.c
index 11f38ebd22c336e0b81af2fa99e10ee235606f4b..8fb9ab4f3c36277f7dc3fa2e9923d6d8b4bffa51 100644 (file)
--- a/tools/pvdisplay.c
+++ b/tools/pvdisplay.c
@@ -106,3 +106,13 @@ int pvdisplay(struct cmd_context *cmd, int argc, char **argv)
 
        return ret;
 }
+
+int pvdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+       return pvdisplay(cmd, argc, argv);
+}
+
+int pvdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+       return pvdisplay(cmd, argc, argv);
+}

diff --git a/tools/tools.h b/tools/tools.h
index 57a42f411f5df782d63a726384edb9568a3e6019..0fa00671c1f52a1e35175275fbc562f161d67d36 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -188,6 +188,13 @@ int lvchange_rebuild_cmd(struct cmd_context *cmd, int argc, char **argv);
 int lvchange_monitor_poll_cmd(struct cmd_context *cmd, int argc, char **argv);
 int lvchange_persistent_cmd(struct cmd_context *cmd, int argc, char **argv);
 
+int lvdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv);
+int pvdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv);
+int pvdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv);
+int vgdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv);
+int vgdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv);
+
 int lvconvert_repair_cmd(struct cmd_context *cmd, int argc, char **argv);
 int lvconvert_replace_pv_cmd(struct cmd_context *cmd, int argc, char **argv);
 

diff --git a/tools/vgdisplay.c b/tools/vgdisplay.c
index e9d08428c7dd8b408bf67cc20a7a76e40a2f4a9e..f4795e8c5322e6b9a0883eb80ff814efb4e3db6f 100644 (file)
--- a/tools/vgdisplay.c
+++ b/tools/vgdisplay.c
@@ -107,3 +107,13 @@ int vgdisplay(struct cmd_context *cmd, int argc, char **argv)
        }
 ************/
 }
+
+int vgdisplay_columns_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+       return vgdisplay(cmd, argc, argv);
+}
+
+int vgdisplay_colon_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+       return vgdisplay(cmd, argc, argv);
+}