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