diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 89c436955..3292061be 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,7 @@ Version 1.02.17 - =================================== + Add recent reporting options to dmsetup man page. + Revise some report fields names. Add dmsetup 'help' command and update usage text. Use fixed-size fields in report interface and reorder. diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in index d1d20bdd2..5b2ed9f85 100644 --- a/man/dmsetup.8.in +++ b/man/dmsetup.8.in @@ -3,6 +3,9 @@ dmsetup \- low level logical volume management .SH SYNOPSIS .ad l +.B dmsetup help +.I [-c|-C|--columns] +.br .B dmsetup create .I device_name [-u uuid] [--notable | --table | table_file] .br @@ -33,21 +36,25 @@ dmsetup \- low level logical volume management .B dmsetup message .I device_name sector message .br -.B dmsetup ls [--target target_type] [--exec command] [--tree [-o options]] +.B dmsetup ls +.I [--target target_type] [--exec command] [--tree [-o options]] .br .B dmsetup info .I [device_name] .br -.B dmsetup info -c|-C|--columns [--noheadings] [-o name] +.B dmsetup info -c|-C|--columns +.I [--noheadings] [--separator separator] [-o fields] [-O|--sort sort_fields] .I [device_name] .br .B dmsetup deps .I [device_name] .br -.B dmsetup status [--target target_type] +.B dmsetup status +.I [--target target_type] .I [device_name] .br -.B dmsetup table [--target target_type] +.B dmsetup table +.I [--target target_type] .I [device_name] .br .B dmsetup wait @@ -103,7 +110,7 @@ Tell the kernel not to supply the open reference count for the device. When creating a device, don't load any table. .IP \fB-o|--options .br -Specify which fields to display. Only \fB-o\ name\fP is supported. +Specify which fields to display. .IP \fB-r|--readonly .br Set the table being loaded read-only. @@ -136,6 +143,11 @@ See below for information on the table format. .br Outputs a list of (major, minor) pairs for devices referenced by the live table for the specified device. +.IP \fBhelp +.I [-c|-C|--columns] +.br +Outputs a summary of the commands available, optionally including +the list of report fields. .IP \fBinfo .I [device_name] .br @@ -154,6 +166,17 @@ Outputs some brief information about the device in the form: Number of targets in the live table .br UUID +.IP \fBinfo -c|-C|--columns +.I [--noheadings] [--separator separator] [-o fields] [-O|--sort sort_fields] +.I [device_name] +.br +Output you can customise. +Fields are comma-separated and chosen from the following list: +name, major, minor, attr, open, segments, events, uuid. +Attributes are: (L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite. +Precede the list with '+' to append +to the default selection of columns instead of replacing it. +Precede any sort_field with - for a reverse sort on that column. .IP \fBls .I [--target target_type] .I [--exec command] diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 9cba8ce4a..09bdf4dbd 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -1568,12 +1568,12 @@ static const struct dm_report_field_type _report_fields[] = { /* *INDENT-OFF* */ FIELD_F(TASK, STR, "Name", 16, dm_name, "name", "Name of mapped device.") FIELD_F(TASK, STR, "UUID", 32, dm_uuid, "uuid", "Unique (optional) identifier for mapped device.") -FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "status", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.") +FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.") FIELD_O(INFO, dm_info, NUM, "Maj", major, 3, int32, "major", "Block device major number.") FIELD_O(INFO, dm_info, NUM, "Min", minor, 3, int32, "minor", "Block device minor number.") -FIELD_O(INFO, dm_info, NUM, "Open", open_count, 4, int32, "open_count", "Number of references to open device, if requested.") -FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "target_count", "Number of segments in live table, if present.") -FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "event_nr", "Current event number.") +FIELD_O(INFO, dm_info, NUM, "Open", open_count, 4, int32, "open", "Number of references to open device, if requested.") +FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.") +FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.") {0, 0, 0, 0, "", "", NULL, NULL}, /* *INDENT-ON* */ }; @@ -1583,7 +1583,7 @@ FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "event_nr", "Current e #undef FIELD_O #undef FIELD_F -static const char *default_report_options = "name,major,minor,status,open_count,target_count,event_nr,uuid"; +static const char *default_report_options = "name,major,minor,attr,open,segments,events,uuid"; static int _report_init(struct command *c) {