34c36b
From 2f90040ff66eacc9715e370cd49ffb72d8d1f36f Mon Sep 17 00:00:00 2001
34c36b
From: Vojtech Trefny <vtrefny@redhat.com>
34c36b
Date: Wed, 11 Jul 2018 15:36:24 +0200
34c36b
Subject: [PATCH] Force command line based libblockdev LVM plugin
34c36b
34c36b
---
34c36b
 blivet/__init__.py | 9 +++++++--
34c36b
 1 file changed, 7 insertions(+), 2 deletions(-)
34c36b
34c36b
diff --git a/blivet/__init__.py b/blivet/__init__.py
34c36b
index c5a75bb..cb75917 100644
34c36b
--- a/blivet/__init__.py
34c36b
+++ b/blivet/__init__.py
34c36b
@@ -63,11 +63,16 @@ gi.require_version("BlockDev", "2.0")
34c36b
 from gi.repository import GLib
34c36b
 from gi.repository import BlockDev as blockdev
34c36b
 if arch.is_s390():
34c36b
-    _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm"))
34c36b
+    _REQUESTED_PLUGIN_NAMES = set(("btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm"))
34c36b
 else:
34c36b
-    _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm"))
34c36b
+    _REQUESTED_PLUGIN_NAMES = set(("btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm"))
34c36b
 
34c36b
 _requested_plugins = blockdev.plugin_specs_from_names(_REQUESTED_PLUGIN_NAMES)
34c36b
+# XXX force non-dbus LVM plugin
34c36b
+lvm_plugin = blockdev.PluginSpec()
34c36b
+lvm_plugin.name = blockdev.Plugin.LVM
34c36b
+lvm_plugin.so_name = "libbd_lvm.so.2"
34c36b
+_requested_plugins.append(lvm_plugin)
34c36b
 try:
34c36b
     # do not check for dependencies during libblockdev initializtion, do runtime
34c36b
     # checks instead
34c36b
-- 
34c36b
1.8.3.1
34c36b