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