diff --git a/0001-force-lvm-plugin.patch b/0001-force-lvm-plugin.patch new file mode 100644 index 0000000..2f9d9a0 --- /dev/null +++ b/0001-force-lvm-plugin.patch @@ -0,0 +1,32 @@ +From 2f90040ff66eacc9715e370cd49ffb72d8d1f36f Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Wed, 11 Jul 2018 15:36:24 +0200 +Subject: [PATCH] Force command line based libblockdev LVM plugin + +--- + blivet/__init__.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/blivet/__init__.py b/blivet/__init__.py +index c5a75bb8..cb759173 100644 +--- a/blivet/__init__.py ++++ b/blivet/__init__.py +@@ -63,11 +63,16 @@ def log_bd_message(level, msg): + from gi.repository import GLib + from gi.repository import BlockDev as blockdev + if arch.is_s390(): +- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm")) ++ _REQUESTED_PLUGIN_NAMES = set(("btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm")) + else: +- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm")) ++ _REQUESTED_PLUGIN_NAMES = set(("btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm")) + + _requested_plugins = blockdev.plugin_specs_from_names(_REQUESTED_PLUGIN_NAMES) ++# XXX force non-dbus LVM plugin ++lvm_plugin = blockdev.PluginSpec() ++lvm_plugin.name = blockdev.Plugin.LVM ++lvm_plugin.so_name = "libbd_lvm.so.2" ++_requested_plugins.append(lvm_plugin) + try: + # do not check for dependencies during libblockdev initializtion, do runtime + # checks instead diff --git a/python-blivet.spec b/python-blivet.spec index e5f0680..a666d5e 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -23,13 +23,14 @@ Version: 3.1.0 %global prerelease .b1 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 0.3%{?prerelease}%{?dist} +Release: 0.4%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ Group: System Environment/Libraries %global realname blivet %global realversion %{version}%{?prerelease} Source0: http://github.com/storaged-project/blivet/archive/%{realname}-%{realversion}.tar.gz +Patch0: 0001-force-lvm-plugin.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -190,6 +191,9 @@ configuration. %endif %changelog +* Tue Jul 17 2018 Vojtech Trefny - 3.1.0-0.4.b1 +- Force command line based libblockdev LVM plugin (vtrefny) + * Fri Jul 13 2018 Fedora Release Engineering - 1:3.1.0-0.3.b1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild