When editing the lvm configuration to set the LVM filter, edit the 'global_filter' key in addition to 'filter': the latter is not used when lvmetad is running, when only the former works. --- daemon/lvm-filter.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 44045b3..8629aab 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -148,7 +148,12 @@ set_filter (char *const *filters) /* Remove all the old filters ... */ r = aug_rm (aug, "/files/lvm/lvm.conf/devices/dict/filter/list/*"); if (r == -1) { - AUGEAS_ERROR ("aug_rm"); + AUGEAS_ERROR ("aug_rm/filter"); + return -1; + } + r = aug_rm (aug, "/files/lvm/lvm.conf/devices/dict/global_filter/list/*"); + if (r == -1) { + AUGEAS_ERROR ("aug_rm/global_filter"); return -1; } @@ -161,7 +166,16 @@ set_filter (char *const *filters) count + 1); if (aug_set (aug, buf, filters[count]) == -1) { - AUGEAS_ERROR ("aug_set: %d: %s", count, filters[count]); + AUGEAS_ERROR ("aug_set/filter: %d: %s", count, filters[count]); + return -1; + } + + snprintf (buf, sizeof buf, + "/files/lvm/lvm.conf/devices/dict/global_filter/list/%d/str", + count + 1); + + if (aug_set (aug, buf, filters[count]) == -1) { + AUGEAS_ERROR ("aug_set/global_filter: %d: %s", count, filters[count]); return -1; } } @@ -170,13 +184,23 @@ set_filter (char *const *filters) r = aug_match (aug, "/files/lvm/lvm.conf/devices/dict/filter/list/*/str", NULL); if (r == -1) { - AUGEAS_ERROR ("aug_match"); + AUGEAS_ERROR ("aug_match/filter"); return -1; } if (r != count) { reply_with_error ("filters# vs matches mismatch: %d vs %d", count, r); return -1; } + r = aug_match (aug, "/files/lvm/lvm.conf/devices/dict/global_filter/list/*/str", + NULL); + if (r == -1) { + AUGEAS_ERROR ("aug_match/global_filter"); + return -1; + } + if (r != count) { + reply_with_error ("global_filter# vs matches mismatch: %d vs %d", count, r); + return -1; + } if (aug_save (aug) == -1) { AUGEAS_ERROR ("aug_save"); -- 2.7.4

On Tue, Jul 26, 2016 at 05:41:26PM +0200, Pino Toscano wrote: Can we move the lvmetad start up to another function? Either that or change the name of the copy_lvm function to more accurately reflect what it does now. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/

The appliance has no LVM system ID set, which means that lvm commands will ignore VGs with a system ID set to anything. Since we want to work with them, pass --foreign at least when listing them to see them. See also lvmsystemid(7). --- daemon/lvm.c | 10 ++++++---- generator/daemon.ml | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/daemon/lvm.c b/daemon/lvm.c index 831c56e..0123ae5 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -194,7 +194,7 @@ do_pvs (void) int r; r = command (&out, &err, - str_lvm, "pvs", "-o", "pv_name", "--noheadings", NULL); + str_lvm, "pvs", "--foreign", "-o", "pv_name", "--noheadings", NULL); if (r == -1) { reply_with_error ("%s", err); free (out); @@ -212,7 +212,7 @@ do_vgs (void) int r; r = command (&out, &err, - str_lvm, "vgs", "-o", "vg_name", "--noheadings", NULL); + str_lvm, "vgs", "--foreign", "-o", "vg_name", "--noheadings", NULL); if (r == -1) { reply_with_error ("%s", err); free (out); @@ -263,6 +263,7 @@ do_lvs (void) if (has_S > 0) { r = command (&out, &err, str_lvm, "lvs", + "--foreign", "-o", "vg_name,lv_name", "-S", "lv_role=public && lv_skip_activation!=1", "--noheadings", @@ -277,6 +278,7 @@ do_lvs (void) } else { r = command (&out, &err, str_lvm, "lvs", + "--foreign", "-o", "lv_attr,vg_name,lv_name", "--noheadings", "--separator", ":", NULL); @@ -718,7 +720,7 @@ get_lvm_field (const char *cmd, const char *field, const char *device) char *out; CLEANUP_FREE char *err = NULL; int r = command (&out, &err, - str_lvm, cmd, + str_lvm, cmd, "--foreign", "--unbuffered", "--noheadings", "-o", field, device, NULL); if (r == -1) { @@ -755,7 +757,7 @@ get_lvm_fields (const char *cmd, const char *field, const char *device) CLEANUP_FREE char *out = NULL, *err = NULL; int r = command (&out, &err, - str_lvm, cmd, + str_lvm, cmd, "--foreign", "--unbuffered", "--noheadings", "-o", field, device, NULL); if (r == -1) { diff --git a/generator/daemon.ml b/generator/daemon.ml index 1d79126..9160beb 100644 --- a/generator/daemon.ml +++ b/generator/daemon.ml @@ -632,6 +632,7 @@ cleanup_free_mountable (mountable_t *mountable) pr "\n"; pr " r = command (&out, &err,\n"; pr " \"lvm\", \"%ss\",\n" typ; + pr " \"--foreign\",\n"; pr " \"-o\", lvm_%s_cols, \"--unbuffered\", \"--noheadings\",\n" typ; pr " \"--nosuffix\", \"--separator\", \"\\r\", \"--units\", \"b\", NULL);\n"; pr " if (r == -1) {\n"; -- 2.7.4

On Tue, Jul 26, 2016 at 05:41:29PM +0200, Pino Toscano wrote: ACK patches 1, 3 & 5. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v