search for: str_lvm

...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 (ou...

Hi, this series improves the way LVM is used in the appliance: in particular, now lvmetad can eventually run at all, and with the correct configuration. Also improve the listing strategies. Thanks, Pino Toscano (5): daemon: lvm-filter: set also global_filter daemon: lvm-filter: start lvmetad better daemon: lvm: improve filter for LVs with activationskip flag set daemon: lvm: list

...S to filter its output. + * It is available only in lvm2 >= 2.02.107. + */ +static int +test_lvs_has_S_opt (void) +{ + static int result = -1; + if (result != -1) + return result; + + CLEANUP_FREE char *out = NULL; + CLEANUP_FREE char *err = NULL; + + int r = command (&out, &err, str_lvm, "lvs", "--help", NULL); + if (r == -1) { + reply_with_error ("lvm lvs --help: %s", err); + return -1; + } + + if (strstr (out, "-S") == NULL) + result = 0; + else + result = 1; + + return result; +} + char ** do_lvs (void) { char *out;...

...1,7 +131,6 @@ mdadm -As --auto=yes --run # Scan for LVM. modprobe dm_mod ||: -lvmetad ||: lvm vgchange -aay --sysinit diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 8629aab..2add95a 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -39,6 +39,7 @@ GUESTFSD_EXT_CMD(str_lvm, lvm); GUESTFSD_EXT_CMD(str_cp, cp); GUESTFSD_EXT_CMD(str_rm, rm); +GUESTFSD_EXT_CMD(str_lvmetad, lvmetad); /* This runs during daemon start up and creates a complete copy of * /etc/lvm so that we can modify it as we desire. We set @@ -97,6 +98,16 @@ copy_lvm (void) snprintf (env, sizeof...

...G (argv, i, "-d"); ADD_ARG (argv, i, tempfile); diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 5eb2402..cde773d 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -31,6 +31,11 @@ #include "daemon.h" #include "actions.h" +GUESTFSD_EXT_CMD(str_lvm, lvm); +GUESTFSD_EXT_CMD(str_vgchange, vgchange); +GUESTFSD_EXT_CMD(str_cp, cp); +GUESTFSD_EXT_CMD(str_rm, rm); + /* This runs during daemon start up and creates a complete copy of * /etc/lvm so that we can modify it as we desire. We set * LVM_SYSTEM_DIR to point to the copy. @@ -65,7 +70,7 @...

...RG (argv, i, "-d"); ADD_ARG (argv, i, tempfile); diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 5eb2402..c57beec 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -31,6 +31,11 @@ #include "daemon.h" #include "actions.h" +GUESTFS_EXT_CMD(str_lvm, lvm); +GUESTFS_EXT_CMD(str_vgchange, vgchange); +GUESTFS_EXT_CMD(str_cp, cp); +GUESTFS_EXT_CMD(str_rm, rm); + /* This runs during daemon start up and creates a complete copy of * /etc/lvm so that we can modify it as we desire. We set * LVM_SYSTEM_DIR to point to the copy. @@ -65,7 +70,7 @@ c...

...S to filter its output. + * It is available only in lvm2 >= 2.02.107. + */ +static int +test_lvs_has_S_opt (void) +{ + static int result = -1; + if (result != -1) + return result; + + CLEANUP_FREE char *out = NULL; + CLEANUP_FREE char *err = NULL; + + int r = command (&out, &err, str_lvm, "lvs", "--help", NULL); + if (r == -1) { + reply_with_error ("lvm lvs --help: %s", err); + return -1; + } + + if (strstr (out, "-S") == NULL) + result = 0; + else + result = 1; + + return result; +} + char ** do_lvs (void) { char *out;...

...rgv, i, "-d"); ADD_ARG (argv, i, tempfile); diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 5c9ce1866..7f25a5eff 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -36,11 +36,6 @@ #include "daemon.h" #include "actions.h" -GUESTFSD_EXT_CMD(str_lvm, lvm); -GUESTFSD_EXT_CMD(str_cp, cp); -GUESTFSD_EXT_CMD(str_rm, rm); -GUESTFSD_EXT_CMD(str_lvmetad, lvmetad); - /* This runs during daemon start up and creates a complete copy of * /etc/lvm so that we can modify it as we desire. We set * LVM_SYSTEM_DIR to point to the copy. Note that the fin...

Hi, this series improves the way LVM is used in the appliance: in particular, now lvmetad can eventually run at all, and with the correct configuration. Also improve the listing strategies. Changes in v2: - dropped patch #5, will be sent separately - move lvmetad statup in own function (patch #2) Thanks, Pino Toscano (4): daemon: lvm-filter: set also global_filter daemon: lvm-filter:

...rgv, i, "-d"); ADD_ARG (argv, i, tempfile); diff --git a/daemon/lvm-filter.c b/daemon/lvm-filter.c index 5c9ce1866..deaecfb67 100644 --- a/daemon/lvm-filter.c +++ b/daemon/lvm-filter.c @@ -36,10 +36,7 @@ #include "daemon.h" #include "actions.h" -GUESTFSD_EXT_CMD(str_lvm, lvm); -GUESTFSD_EXT_CMD(str_cp, cp); -GUESTFSD_EXT_CMD(str_rm, rm); -GUESTFSD_EXT_CMD(str_lvmetad, lvmetad); +DECLARE_EXTERNAL_COMMANDS ("lvm", "cp", "rm", "lvmetad") /* This runs during daemon start up and creates a complete copy of * /etc/lvm so that...

...;. Thanks: Fabian Deutsch --- daemon/lvm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/daemon/lvm.c b/daemon/lvm.c index d989986..6e201e3 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -148,7 +148,9 @@ do_lvs (void) r = command (&out, &err, str_lvm, "lvs", - "-o", "vg_name,lv_name", "--noheadings", + "-o", "vg_name,lv_name", + "-S", "lv_role=public", + "--noheadings", "--separat...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

...= 10 && lv_attr[9] == 'k') + goto skip_line; + /* Ignore "unknown device" message (RHBZ#1054761). */ if (STRNEQ (p, "unknown device")) { char buf[256]; @@ -260,7 +264,7 @@ do_lvs (void) r = command (&out, &err, str_lvm, "lvs", "-o", "vg_name,lv_name", - "-S", "lv_role=public", + "-S", "lv_role=public && lv_active=active", "--noheadings", &quo...

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’

...S to filter its output. - * It is available only in lvm2 >= 2.02.107. - */ -static int -test_lvs_has_S_opt (void) -{ - static int result = -1; - if (result != -1) - return result; - - CLEANUP_FREE char *out = NULL; - CLEANUP_FREE char *err = NULL; - - int r = command (&out, &err, str_lvm, "lvs", "--help", NULL); - if (r == -1) { - reply_with_error ("lvm lvs --help: %s", err); - return -1; - } - - if (strstr (out, "-S") == NULL) - result = 0; - else - result = 1; - - return result; -} - -char ** -do_lvs (void) -{ - char *out;...

...++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/daemon/lvm.c b/daemon/lvm.c > index d989986..6e201e3 100644 > --- a/daemon/lvm.c > +++ b/daemon/lvm.c > @@ -148,7 +148,9 @@ do_lvs (void) > > r = command (&out, &err, > str_lvm, "lvs", > - "-o", "vg_name,lv_name", "--noheadings", > + "-o", "vg_name,lv_name", > + "-S", "lv_role=public", > + "--noheadings", >...

...aec4b93c3bf13181212d3c6430. --- daemon/lvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/lvm.c b/daemon/lvm.c index a270b13..c186a5a 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -264,7 +264,7 @@ do_lvs (void) r = command (&out, &err, str_lvm, "lvs", "-o", "vg_name,lv_name", - "-S", "lv_role=public && lv_skip_activation!=1", + "-S", "lv_role=public && lv_skip_activation!=yes", "--...

...s flag. --- daemon/lvm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/lvm.c b/daemon/lvm.c index c186a5a5e..6c57046ff 100644 --- a/daemon/lvm.c +++ b/daemon/lvm.c @@ -625,6 +625,7 @@ do_pvresize_size (const char *device, int64_t size) r = command (NULL, &err, str_lvm, "pvresize", + "--yes", "--setphysicalvolumesize", buf, device, NULL); if (r == -1) { -- 2.12.0

Hi, currently /etc/shadow is edited manually when needed (i.e. when setting the password for an user), and it is not changed when removing users. Import the upstream shadow.aug (currently in their development serie, but not part of any released version yet), and use it only when the augeas version is less than a potential 1.2.1 (covering also the case when the new version is just 1.3.0). Pino

Add some warnings. Well, the first patch is a miscellaneous change, but patches 2-5 add some warnings. Rich.