Update lvm2 to upstream version 2.03.28

Resolves: RHEL-61251
This commit is contained in:
Marian Csontos 2024-11-04 17:23:44 +01:00
parent 0790aa7c85
commit ba122267d8
13 changed files with 51 additions and 119 deletions

View File

@ -1,4 +1,4 @@
From 7569c683982e4d38a2f7a764af45849973916614 Mon Sep 17 00:00:00 2001
From 4ed40e67197778b28e4b822558614a517242e3e1 Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 3 Oct 2024 16:14:11 +0200
Subject: [PATCH 1/7] RHEL9
@ -9,19 +9,19 @@ Subject: [PATCH 1/7] RHEL9
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/VERSION b/VERSION
index a2dee96dd..f6307c92a 100644
index 7619e491b..f96b435a3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.03.27(2) (2024-10-02)
+2.03.27(2)-RHEL9 (2024-10-09)
-2.03.28(2) (2024-11-04)
+2.03.28(2)-RHEL9 (2024-11-04)
diff --git a/VERSION_DM b/VERSION_DM
index 381304a10..3b828d026 100644
index 16d64d69d..cd0c694ae 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.201 (2024-10-02)
+1.02.201-RHEL9 (2024-10-09)
-1.02.202 (2024-11-04)
+1.02.202-RHEL9 (2024-11-04)
--
2.46.2
2.47.0

View File

@ -1,4 +1,4 @@
From 36f02113cfd423f479ad6eef4fbd934ec6788965 Mon Sep 17 00:00:00 2001
From 290f2740efee0f9a3f6b9f84c277e0d4e81927db Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 16 May 2024 15:30:02 +0200
Subject: [PATCH 2/7] Revert "10-dm.rules: bump DM_UDEV_RULES_VSN to 3"
@ -46,5 +46,5 @@ index db4ee771d..ca255c793 100644
ENV{DM_UDEV_DISABLE_DM_RULES_FLAG}!="1", ENV{DM_NAME}=="?*", SYMLINK+="(DM_DIR)/$env{DM_NAME}"
--
2.46.2
2.47.0

View File

@ -1,4 +1,4 @@
From 9065df386d008e78f27d819f05881324c63ae15a Mon Sep 17 00:00:00 2001
From 57fa9b840028112e9e455c960dad5bd595625428 Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 16 May 2024 15:30:15 +0200
Subject: [PATCH 3/7] Revert "dm udev rules: don't export and save DM_NOSCAN"
@ -39,5 +39,5 @@ index 03ea203ee..96f1efc00 100644
(BLKID_RULE)
GOTO="dm_link"
--
2.46.2
2.47.0

View File

@ -1,4 +1,4 @@
From 20504eedd35180bb77f61574ae9589b9d591f258 Mon Sep 17 00:00:00 2001
From 885113b30d7873ac671490715312431f706d26e8 Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 16 May 2024 15:30:24 +0200
Subject: [PATCH 4/7] Revert "dm udev rules: don't export and save
@ -84,5 +84,5 @@ index 96f1efc00..3e1eaa6ee 100644
(BLKID_RULE)
--
2.46.2
2.47.0

View File

@ -1,4 +1,4 @@
From 534860de44b74fb6ac39c0947a948972bab74566 Mon Sep 17 00:00:00 2001
From 89058bc0687baec653df87f14fd25da32577cc6d Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 16 May 2024 15:30:37 +0200
Subject: [PATCH 5/7] Revert "11-dm-lvm.rules: don't restore
@ -34,5 +34,5 @@ index 6dd556aa9..9836f41ca 100644
ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
--
2.46.2
2.47.0

View File

@ -1,4 +1,4 @@
From aeef0d56fba20f66ceec086e22d4434171bcc811 Mon Sep 17 00:00:00 2001
From cccc336a97ce85cf68ec7a80390c42dae243621b Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 16 May 2024 15:30:48 +0200
Subject: [PATCH 6/7] Revert "10-dm-rules: don't restore
@ -45,5 +45,5 @@ index 29fe71527..2c6903da7 100644
# If DISK_RO is set, it's an uevent that changes the ro attribute of the device.
--
2.46.2
2.47.0

View File

@ -1,40 +1,27 @@
From e7537748c81e00d308408509a8e206cb858937aa Mon Sep 17 00:00:00 2001
From e6f8d9855336dbf1cbf212f60b84a03946365795 Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 16 May 2024 15:34:28 +0200
Subject: [PATCH 7/7] WHATS_NEW: update
---
WHATS_NEW | 4 ++++
WHATS_NEW_DM | 7 +++++++
2 files changed, 11 insertions(+)
1 file changed, 7 insertions(+)
diff --git a/WHATS_NEW b/WHATS_NEW
index 3568a13c3..f7666e61a 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,7 @@
+Version 2.03.28 -
+==================
+ Revert Don't import DM_UDEV_DISABLE_OTHER_RULES_FLAG in LVM rules, DM rules cover it.
+
Version 2.03.27 - 02nd October 2024
===================================
Fix swap device size detection using blkid for lvresize/lvreduce/lvextend.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 7d4fbf99a..7b6af57c3 100644
index f8ca946d6..74b356bf2 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,3 +1,10 @@
+Version 1.02.202 -
+===================
+Version 1.02.203 -
+=====================================
+ Revert Increase DM_UDEV_RULES_VSN to 3 to indicate changed udev rules.
+ Revert Rename DM_NOSCAN to .DM_NOSCAN so it's not stored in udev db.
+ Revert Rename DM_SUSPENDED to .DM_SUSPENDED so it's not stored in udev db.
+ Revert Do not import DM_UDEV_DISABLE_OTHER_RULES_FLAG from db in 10-dm-disk.rules.
+
Version 1.02.201 - 02nd October 2024
====================================
Cleanup udev sync semaphore if dm_{udev_create,task_set}_cookie fails.
Version 1.02.202 - 04th November 2024
=====================================
Introduce dm_config_parse_only_section to stop parsing after section.
--
2.46.2
2.47.0

View File

@ -1,58 +0,0 @@
From 169430559462d162c6e44157f97126a1e75f1aed Mon Sep 17 00:00:00 2001
From: Peter Rajnoha <prajnoha@redhat.com>
Date: Thu, 3 Oct 2024 09:38:11 +0200
Subject: [PATCH] dev-type: detect mixed dos partition with gpt's PMBR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Detect when we have mixed dos partition with gpt's PMBR partition.
This is not a sane configuration, but detect it anyway, just in case
someone configures such partition layout manually and forcefully and
incorrectly defines one of the partition types to be the GPT's PMBR.
For example:
fdisk -l /dev/sdc
Device Boot Start End Sectors Size Id Type
/dev/sdc1 2048 67583 65536 32M 83 Linux
/dev/sdc2 67584 262143 194560 95M ee GPT
Before:
(The partition filter passes even though there's real existing dos
partition - the empty GPT PMBR overrides it.)
pvcreate /dev/sdc
WARNING: PMBR signature detected on /dev/sdc at offset 510. Wipe it? [y/n]:
Wiping PMBR signature on /dev/sdc.
Physical volume "/dev/sdc" successfully created.
With this patch applied:
(The GPT PMBR does not override the existence of the dos partition.)
pvcreate /dev/sdc
Cannot use /dev/sdc: device is partitioned
(cherry picked from commit 317fae4024d9a2a114cf30496500501bdf41ba20)
---
lib/device/dev-type.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
index e89ed82c8..e3504e2b7 100644
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -663,7 +663,7 @@ static int _has_partition_table(struct device *dev)
* If this is GPT's PMBR, then also
* check for gpt partition table.
*/
- if (buf.part[p].sys_ind == PART_MSDOS_TYPE_GPT_PMBR)
+ if (buf.part[p].sys_ind == PART_MSDOS_TYPE_GPT_PMBR && !ret)
ret = _has_gpt_partition_table(dev);
else
ret = 1;
--
2.46.2

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmb9O0QACgkQuREkMeUJ
A59blxAAraLzbe26vbGYFvD2xjYuP/etKjJ2ajg0gUypPniiiAdAeDz1kAWXNsy8
Cw9c3XYygHIR2qBnjgnYTrQeFBTa+IvM9PwCj1xqaXNwc4w2JroCw+X2nchLxdL+
/uf2xVHOsPNTgAyw7E0bfMfCrPMOFeQk2EI+4ZDTEnWTZ14rysbJvjuPtp+rwSI0
jQRl3lOCqrM5dQLgpLPzyQwnbz1Y3oarVw0TpkOsj8vBC5Laf+jb3I4AkJ3dzQzC
ieXosjs86PbNhfZ2l853TiVylZONNpHVdn2abjCpV86Di6E1kzidzI2S58P4AxZB
Iu5vf50g/qUMii775Ain6dkzCZkCvtQPcaQx7jObn93Tm3HLVkgkudewm7Ryjmb3
xXTztg3Gz3tf59rch/2CYaaPENDh6f46lK+xIo6ZuQhqABN3nLsPmjxCzipKd6ME
ni0DiIvfrybioof8djDCXDUtfaVs1+lR2LbjPCy462nVmFdeCE5SK33XP1qxHcaJ
oZvi53aJZakRcnEu4Cg78acrAzf6gGB+5DOHMySeqXC3OauXDlJUdE6Nd/drK2wb
YqF/0QYY/OJXdgcCT/MR9avNi8MFvbkNgBovMu0oDPuVkixSUburg9d+lrfbjCo9
UAISTfzJD6kJGdwDUWDbshgwBfz6zh8LxVgmbJhuZAs4h5TsfaM=
=wVsE
-----END PGP SIGNATURE-----

16
LVM2.2.03.28.tgz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmco678ACgkQuREkMeUJ
A5+9sg//dj5ijpYvX/daRifbNJV+Xj2XzYWAe3WS2X/z0Zw1gb+JhiUo841sgElA
VtusYW5bUGaPLTggPm1YS+KUiOiUqYnAGcCSSRhjScBD3xjDWVnRosIB2HqqtgX3
g7qjYk1H6gcvREyYw0AdDdoLwJOs6xaCO22f/Z0XYyxtcXIDKXY5oYo3frmYJoUZ
KA/IJDw8D9iIW/NqUr1allaEw95bOh/8BDfrQCK9ZHDJD9ctfzSAiLfe8F+6W9gj
m1FDF3eI6Oly0w/qvigQpIqv5oQpljr49lVTR5Z8eh+tdZxHyhdnivZlqAcjSq3n
yj/UHxj/DqdCnz2O/PQrAOeAh0tU6u9H6mM9Ahn3V9fID4i1gHWyj0ag3qHL2X4e
mIdI3r5nqq4OqZnefnYrfHWQZmhmLicjHTz/+A+ULVi8Sbu6Ou9wVBRTBTkYVTK/
9/i6lJ3G/REtMCtmanJ/ZYna6/Nzn7Edl+NtCR1CfsnTFrcNsm/gS2dUT7x0PSNE
JkBxcBUQQjAwWKfp1dd5ItxPYYchaUYv/VmQDnuvrGxwarJua/0bSo9pWXbgeCj9
VnaBQWgQ3lOhpxof5WECfyZ9dmYIoeVBvlP6bPjbacLWl/R6e+FdWZ3njIDAA93k
k81VtwQZN9OK7KchW61dau7eSDW5YcNOH2DcQQSKnlCBeOAeD+Q=
=Kg6P
-----END PGP SIGNATURE-----

View File

@ -1,4 +1,4 @@
%global device_mapper_version 1.02.201
%global device_mapper_version 1.02.202
%global enable_cache 1
%global enable_lvmdbusd 1
@ -50,7 +50,7 @@ Name: lvm2
%if 0%{?rhel}
Epoch: %{rhel}
%endif
Version: 2.03.27
Version: 2.03.28
%if 0%{?from_snapshot}
Release: 0.1.20211115git%{shortcommit}%{?dist}%{?rel_suffix}
%else
@ -70,7 +70,6 @@ Patch4: 0004-Revert-dm-udev-rules-don-t-export-and-save-DM_SUSPEN.patch
Patch5: 0005-Revert-11-dm-lvm.rules-don-t-restore-DM_UDEV_DISABLE.patch
Patch6: 0006-Revert-10-dm-rules-don-t-restore-DM_UDEV_DISABLE_OTH.patch
Patch7: 0007-WHATS_NEW-update.patch
Patch8: 0008-dev-type-detect-mixed-dos-partition-with-gpt-s-PMBR.patch
BuildRequires: make
BuildRequires: gcc
@ -701,6 +700,10 @@ An extensive functional testsuite for LVM2.
%endif
%changelog
* Tue Nov 05 2024 Marian Csontos <mcsontos@redhat.com> - 2.03.28-1
- Update to upstream version 2.03.28.
- See WHATS_NEW and WHATS_NEW_DM for more information.
* Wed Oct 09 2024 Marian Csontos <mcsontos@redhat.com> - 2.03.27-1
- Update to upstream version 2.03.27.
- See WHATS_NEW and WHATS_NEW_DM for more information.

View File

@ -1 +1 @@
SHA512 (LVM2.2.03.27.tgz) = 02607797f067b2b26d615b9a182ad70017e61d436e3866acf820a04154e503fb59114e9a4540a273d9f570d0337332ca995fb3be83c11eadaca53c1b826eb810
SHA512 (LVM2.2.03.28.tgz) = 6b203dcf71ec91e663512458a6b25ebee4c7ee699c67f26ad42a74c054d157bd7f74f8f17f4217dd660b4bf421dd26ee1dd6048f321696168c9e81b354a8393a

View File

@ -1 +1 @@
LVM2.2.03.27.tgz
LVM2.2.03.28.tgz