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