Backport PR #114 to fix #2180557

This commit is contained in:
Adam Williamson 2023-03-21 17:37:52 -07:00
parent 102c0f74e7
commit 7a015859c9
2 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,26 @@
From d1ed4ce6ce9f201435af61982a36f97e9d9d2f94 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 21 Mar 2023 11:46:54 -0700
Subject: [PATCH] Fix import of utils from lvmdbusd.cfg
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
daemons/lvmdbusd/cfg.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemons/lvmdbusd/cfg.py b/daemons/lvmdbusd/cfg.py
index 9da4b1267..9f4360100 100644
--- a/daemons/lvmdbusd/cfg.py
+++ b/daemons/lvmdbusd/cfg.py
@@ -11,7 +11,7 @@ import os
import multiprocessing
import queue
import itertools
-from utils import LvmDebugData
+from lvmdbusd.utils import LvmDebugData
from lvmdbusd import path
--
2.40.0

View File

@ -45,10 +45,14 @@ Name: lvm2
Epoch: %{rhel}
%endif
Version: 2.03.20
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
URL: https://sourceware.org/lvm2/
Source0: https://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz
# https://bugzilla.redhat.com/show_bug.cgi?id=2180557
# https://github.com/lvmteam/lvm2/pull/114
# Fix an invalid import which breaks lvm2-lvmdbusd.service and thus anaconda
Patch0: 0001-Fix-import-of-utils-from-lvmdbusd.cfg.patch
#Patch1: 0001-*
BuildRequires: make
@ -102,7 +106,7 @@ or more physical volumes and creating one or more logical volumes
(kind of logical partitions) in volume groups.
%prep
%setup -q -n LVM2.%{version}
%autosetup -p1 -n LVM2.%{version}
#%%patch1 -p1 -b .backup1
%build
@ -656,6 +660,9 @@ An extensive functional testsuite for LVM2.
%endif
%changelog
* Tue Mar 21 2023 Adam Williamson <awilliam@redhat.com> - 2.03.20-2
- Backport PR #114 to fix #2180557
* Tue Mar 21 2023 Marian Csontos <mcsontos@redhat.com> - 2.03.20-1
- Update to upstream version 2.03.20.