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