packages/python-blivet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!121 fix lvs lost

Browse Source 
From: @sun_hai_10 
Reviewed-by: @anonymous_z 
Signed-off-by: @anonymous_z
This commit is contained in:
openeuler-ci-bot 2024-03-26 13:23:56 +00:00 committed by Gitee
commit d1447f01db
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-force-lvm-plugin.patch
View File

@ -1,33 +0,0 @@
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 0c76dab..c2463d4 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -63,11 +63,16 @@ gi.require_version("BlockDev", "3.0")
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", "nvme"))
+ _REQUESTED_PLUGIN_NAMES = set(("btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "s390", "nvdimm", "nvme"))
else:
- _REQUESTED_PLUGIN_NAMES = set(("lvm", "btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm", "nvme"))
+ _REQUESTED_PLUGIN_NAMES = set(("btrfs", "swap", "crypto", "loop", "mdraid", "mpath", "dm", "nvdimm", "nvme"))
_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.3"
+_requested_plugins.append(lvm_plugin)
try:
succ_, avail_plugs = blockdev.try_reinit(require_plugins=_requested_plugins, reload=False, log_func=log_bd_message)
except GLib.GError as err:

13
python-blivet.spec
View File

@ -3,7 +3,7 @@
Name: python-blivet
Version: 3.8.2
Release: 2
Release: 3
Epoch: 1
Summary: A python module for system storage configuration
License: LGPL-2.1-or-later
@ -17,8 +17,7 @@ BuildRequires: systemd gettext python3-devel python3-setuptools
BuildRequires: python2-devel python2-setuptools
%endif
Patch0: 0001-force-lvm-plugin.patch
Patch1: fix-the-long-hostname.patch
Patch0: fix-the-long-hostname.patch
%ifarch sw_64
patch9001: blivet-3.4.2-sw.patch
@ -32,7 +31,7 @@ storage configuration.
%package -n blivet-data
Summary: Data packages for python-blivet
Conflicts: python-blivet < 1:2.0.0 python3-blivet < 1:2.0.0
Obsoletes: python2-blivet
Obsoletes: python2-blivet
%description -n blivet-data
Data packages for python-blivet.
@ -125,6 +124,12 @@ make PYTHON=%{__python2} DESTDIR=%{buildroot} install
%doc README.md
%changelog
* Tue Mar 26 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix lvs lost
* Wed Feb 28 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-2
- Type:enhancement
- ID:NA