Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lvm: Require higher version of LVM for lvm.conf parsing #1092

Merged
merged 2 commits into from
Jan 31, 2025
Merged

lvm: Require higher version of LVM for lvm.conf parsing #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64083c0
lvm: Require higher version of LVM for lvm.conf parsing
vojtechtrefny Jan 31, 2025
caa40c7
lvm: Fix check for BD_LVM_TECH_CONFIG availability in CLI plugin
vojtechtrefny Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/lvm-dbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ static GMutex deps_check_lock;
static const UtilDep deps[DEPS_LAST] = {
{"lvm", LVM_MIN_VERSION, "version", "LVM version:\\s+([\\d\\.]+)"},
{"lvmdevices", NULL, NULL, NULL},
{"lvmconfig", NULL, NULL, NULL},
{"lvmconfig", "2.03.17", "--version", "LVM version:\\s+([\\d\\.]+)"},
};

#define DBUS_DEPS_LVMDBUSD 0
Expand Down
7 changes: 6 additions & 1 deletion src/plugins/lvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,14 @@ static GMutex deps_check_lock;
#define DEPS_LVM_MASK (1 << DEPS_LVM)
#define DEPS_LVMDEVICES 1
#define DEPS_LVMDEVICES_MASK (1 << DEPS_LVMDEVICES)
#define DEPS_LAST 2
#define DEPS_LVMCONFIG 2
#define DEPS_LVMCONFIG_MASK (1 << DEPS_LVMCONFIG)
#define DEPS_LAST 3

static const UtilDep deps[DEPS_LAST] = {
{"lvm", LVM_MIN_VERSION, "version", "LVM version:\\s+([\\d\\.]+)"},
{"lvmdevices", NULL, NULL, NULL},
{"lvmconfig", "2.03.17", "--version", "LVM version:\\s+([\\d\\.]+)"},
};

#define FEATURES_VDO 0
Expand Down Expand Up @@ -396,6 +399,8 @@ gboolean bd_lvm_is_tech_avail (BDLVMTech tech, guint64 mode, GError **error) {
check_deps (&avail_deps, DEPS_LVM_MASK, deps, DEPS_LAST, &deps_check_lock, error);
case BD_LVM_TECH_DEVICES:
return check_deps (&avail_deps, DEPS_LVMDEVICES_MASK, deps, DEPS_LAST, &deps_check_lock, error);
case BD_LVM_TECH_CONFIG:
return check_deps (&avail_deps, DEPS_LVMCONFIG_MASK, deps, DEPS_LAST, &deps_check_lock, error);
default:
/* everything is supported by this implementation of the plugin */
return check_deps (&avail_deps, DEPS_LVM_MASK, deps, DEPS_LAST, &deps_check_lock, error);
Expand Down
6 changes: 6 additions & 0 deletions tests/skip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,9 @@
- test: lvm_dbus_tests.LvmTestPartialLVs
skip_on:
- reason: "LVM DBus doesn't support LV repair yet"

- test: (lvm_test|lvm_dbus_tests).LvmNoDevTestCase.test_lvm_config
skip_on:
- distro: "debian"
version: "12"
reason: "LVM >= 2.03.17 needed for LVM config parsing with --valuesonly"