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