1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-31 14:50:37 +03:00

post-release - reinstate incomplete enhancements

This commit is contained in:
Alasdair Kergon 2008-04-29 16:11:28 +00:00
parent 8bdde01bef
commit 57244a6823
5 changed files with 20 additions and 5 deletions

View File

@ -1 +1 @@
2.02.36-cvs (2008-04-29)
2.02.37-cvs (2008-04-29)

View File

@ -1,3 +1,8 @@
Version 2.02.37 -
=================================
Check lv_count in vg_validate.
Add --prefixes to reporting tools for field name prefix output format.
Version 2.02.36 - 29th April 2008
=================================
Fix fsadm.sh to work with older blockdev, blkid & readlink binaries.

View File

@ -1213,10 +1213,11 @@ int vg_validate(struct volume_group *vg)
if ((lv_count = (uint32_t) list_size(&vg->lvs)) !=
vg->lv_count + 2 * vg->snapshot_count) {
log_debug("Internal error: #internal LVs (%u) != #LVs (%"
log_error("Internal error: #internal LVs (%u) != #LVs (%"
PRIu32 ") + 2 * #snapshots (%" PRIu32 ") in VG %s",
list_size(&vg->lvs), vg->lv_count,
vg->snapshot_count, vg->name);
r = 0;
}
list_iterate_items(lvl, &vg->lvs) {

View File

@ -1091,9 +1091,15 @@ void *report_init(struct cmd_context *cmd, const char *format, const char *keys,
if (headings)
report_flags |= DM_REPORT_OUTPUT_HEADINGS;
if (field_prefixes)
report_flags |= DM_REPORT_OUTPUT_FIELD_NAME_PREFIX;
rh = dm_report_init(report_type, _report_types, _fields, format,
separator, report_flags, keys, cmd);
if (field_prefixes)
dm_report_set_output_field_name_prefix(rh, "lvm2_");
return rh;
}

View File

@ -368,6 +368,7 @@ xx(lvs,
"\t[-o|--options [+]Field[,Field]]\n"
"\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
"\t[-P|--partial] " "\n"
"\t[--prefixes]\n"
"\t[--segments]\n"
"\t[--separator Separator]\n"
"\t[--trustcache]\n"
@ -378,7 +379,7 @@ xx(lvs,
"\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n",
aligned_ARG, all_ARG, ignorelockingfailure_ARG, noheadings_ARG,
nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG,
nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, prefixes_ARG,
segments_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG,
units_ARG)
@ -576,6 +577,7 @@ xx(pvs,
"\t[-o|--options [+]Field[,Field]]\n"
"\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
"\t[-P|--partial] " "\n"
"\t[--prefixes]\n"
"\t[--segments]\n"
"\t[--separator Separator]\n"
"\t[--trustcache]\n"
@ -586,7 +588,7 @@ xx(pvs,
"\t[PhysicalVolume [PhysicalVolume...]]\n",
aligned_ARG, all_ARG, ignorelockingfailure_ARG, noheadings_ARG,
nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG,
nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, prefixes_ARG,
segments_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG,
units_ARG)
@ -892,6 +894,7 @@ xx(vgs,
"\t[-o|--options [+]Field[,Field]]\n"
"\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
"\t[-P|--partial] " "\n"
"\t[--prefixes]\n"
"\t[--separator Separator]\n"
"\t[--trustcache]\n"
"\t[--unbuffered]\n"
@ -901,7 +904,7 @@ xx(vgs,
"\t[VolumeGroupName [VolumeGroupName...]]\n",
aligned_ARG, all_ARG, ignorelockingfailure_ARG, noheadings_ARG,
nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG,
nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, prefixes_ARG,
separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, units_ARG)
xx(vgscan,