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