diff options
| author | David Teigland <teigland@redhat.com> | 2016-05-17 12:03:25 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2016-05-18 09:05:26 -0500 |
| commit | 591ef307b30c2d828b2a0c59918203f970974bbb (patch) | |
| tree | dbf1a198919de08a28067cf61f680e6e9b0fdf3d | |
| parent | 7fd4119d24eee55323e888dd78c70257d7c97a15 (diff) | |
| download | lvm2-591ef307b30c2d828b2a0c59918203f970974bbb.tar.gz | |
lvm2_activation_generator: don't create full context for liblvm2app
Don't use lvm_init() to create a full command context, which
does a lot of command setup (like connecting to daemons), which
is unnecessary for simply reading a value from lvm.conf.
Passing a NULL context arg to the lvm_config_ function is now
allowed, in which case lvm.conf is read without doing lvm
command setup.
| -rw-r--r-- | scripts/lvm2_activation_generator_systemd_red_hat.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c index 62467bddd..d83e721f1 100644 --- a/scripts/lvm2_activation_generator_systemd_red_hat.c +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -69,16 +69,10 @@ static void kmsg(int log_level, const char *format, ...) static void lvm_get_use_lvmetad_and_lvmpolld(int *use_lvmetad, int *use_lvmpolld) { - lvm_t lvm; - *use_lvmetad = *use_lvmpolld = 0; - if (!(lvm = lvm_init(NULL))) { - kmsg(LOG_ERR, "LVM: Failed to initialize library context for activation generator.\n"); - return; - } - *use_lvmetad = lvm_config_find_bool(lvm, LVM_CONF_USE_LVMETAD, 0); - *use_lvmpolld = lvm_config_find_bool(lvm, LVM_CONF_USE_LVMPOLLD, 0); - lvm_quit(lvm); + + *use_lvmetad = lvm_config_find_bool(NULL, LVM_CONF_USE_LVMETAD, 0); + *use_lvmpolld = lvm_config_find_bool(NULL, LVM_CONF_USE_LVMPOLLD, 0); } static int register_unit_with_target(const char *dir, const char *unit, const char *target) |