search for: make_filter_string

Hi, newer lvm2 releases don't have have uncommented "filter" lines, so the current way to edit lvm.conf doesn't work anymore. Instead, switch to augeas (with a "custom" len) for a cleaner and working way to set the lvm filter. Pino Toscano (3): daemon: add add_sprintf daemon: move AUGEAS_ERROR to the common header daemon: lvm-filter: use augeas for setting the

...if (end_stringsbuf (&ret) == -1) return NULL; - return ret.argv; + return take_stringsbuf (&ret); } int diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index eadc472..6195239 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -240,7 +240,7 @@ static char ** make_filter_strings (char *const *devices) { size_t i; - DECLARE_STRINGSBUF (ret); + CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (ret); for (i = 0; devices[i] != NULL; ++i) { /* Because of the way matching works in LVM (yes, they wrote their @@ -254,26 +254,21 @@ make_filter_strings (char *const *devic...

If add_string_nodup fails free the passed string instead of leaking it, as that string would have been owned by the stringbuf. Adapt few places to this behaviour. --- daemon/btrfs.c | 4 +--- daemon/devsparts.c | 8 ++++---- daemon/guestfsd.c | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 9b52aa8..d70565a 100644 ---

...quot;, + mountable->device, mountable->volume) == -1) return NULL; + return desc; + + default: + return NULL; } } diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 72fe6ac..12c4ca7 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -270,7 +270,7 @@ make_filter_strings (char *const *devices) return ret.argv; -error: + error: if (ret.argv) free_stringslen (ret.argv, ret.size); return NULL; diff --git a/daemon/lvm.c b/daemon/lvm.c index f9acfcb..421c1c5 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -286,7 +286,7 @@ static int ignore_same_size_...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67