post-release - reinstate incomplete enhancements

diff --git a/VERSION b/VERSION
index a76ca10658ea5e64849962811062ab2718969119..69bf08b5a2f71c254325ae0f3e135e9bf3679966 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.36-cvs (2008-04-29)
+2.02.37-cvs (2008-04-29)

diff --git a/WHATS_NEW b/WHATS_NEW
index 7ed3774b73507bf83185b4f0d77a63026b9ca678..0bd31b1057353a51cc237e9c4bcfbaff55eb67fd 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -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.

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 82a914b793cce9a8456c9a0a66a9855c1e93a78a..8182734a703cb8b0b52bd6d8ee995acee734b0af 100644 (file)
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -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) {

diff --git a/lib/report/report.c b/lib/report/report.c
index d067bd305890971970b753bf7af77187ace62d89..f2ffd98271aae7b8f78e1d1e965160f69e01a178 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -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;
 }
 

diff --git a/tools/commands.h b/tools/commands.h
index 7c0921c1c46b12a88a582177d0ebeb1382b6f075..efac7594c12f24d6cc7620bdfb4b0cff703665eb 100644 (file)
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -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,