From 0994081ffdd8ba2b06cebadd23d3edeaff24f3c9 Mon Sep 17 00:00:00 2001 From: wangziliang Date: Mon, 24 Jun 2024 09:06:17 +0000 Subject: [PATCH] backport upstream patch (cherry picked from commit 14f9853b9625b6ecdc10afa6d4f85c5e9f0b1e46) --- ...disk-by-label-symlinks-for-DM-devs-t.patch | 35 +++++++++++++++++++ lvm2.spec | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0020-udev-create-dev-disk-by-label-symlinks-for-DM-devs-t.patch diff --git a/0020-udev-create-dev-disk-by-label-symlinks-for-DM-devs-t.patch b/0020-udev-create-dev-disk-by-label-symlinks-for-DM-devs-t.patch new file mode 100644 index 0000000..1d90e37 --- /dev/null +++ b/0020-udev-create-dev-disk-by-label-symlinks-for-DM-devs-t.patch @@ -0,0 +1,35 @@ +From f09a9927207f81b33b9eee8ac5660d90e695dad1 Mon Sep 17 00:00:00 2001 +From: Peter Rajnoha +Date: Mon, 25 Mar 2024 10:16:04 +0100 +Subject: [PATCH] udev: create /dev/disk/by-label symlinks for DM devs that + have crypto as next layer + +We already create /dev/disk/by-uuid symlinks for DM devices which +contain crypto-type as next layer (as identified by blkid). + +Also create /dev/disk/by-label symlinks as the labels can be +defined for crypto-type devices too. + +Reported and fix suggested by: Patrick Plenefisch +See also: +https://lore.kernel.org/lvm-devel/CAOCpoWfYjOVNJNt+cnOVXDHiDq2wRogTqBijcUoa7chqOLRa5Q@mail.gmail.com/ +--- + udev/13-dm-disk.rules.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +diff --git a/udev/13-dm-disk.rules.in b/udev/13-dm-disk.rules.in +index 496dd06c5..b53bb62de 100644 +--- a/udev/13-dm-disk.rules.in ++++ b/udev/13-dm-disk.rules.in +@@ -38,7 +38,7 @@ IMPORT{db}="ID_PART_GPT_AUTO_ROOT" + LABEL="dm_link" + ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS="link_priority=-100" + ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" +-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" ++ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" + ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/by-partuuid/$env{ID_PART_ENTRY_UUID}" + ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="disk/by-partlabel/$env{ID_PART_ENTRY_NAME}" + ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_GPT_AUTO_ROOT}=="1", SYMLINK+="gpt-auto-root" +-- +2.33.0 + diff --git a/lvm2.spec b/lvm2.spec index 5b7e55a..9330643 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -43,7 +43,7 @@ Name: lvm2 Version: 2.03.21 -Release: 9 +Release: 10 Epoch: 8 Summary: Tools for logical volume management License: GPLv2+ and LGPLv2.1 and BSD @@ -68,6 +68,7 @@ Patch16: 0016-dm-event-release-buffer-on-dm_event_get_version.patch Patch17: 0017-clean-up-group-struct-in-_stats_create_group-error-path.patch Patch18: 0018-do-not-pass-empty-string-in-callback.patch Patch19: 0019-fix-memleak-in-vgchange.patch +Patch20: 0020-udev-create-dev-disk-by-label-symlinks-for-DM-devs-t.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -494,6 +495,9 @@ fi %changelog +* Mon Jun 24 2024 wangziliang - 8:2.03.21-10 +- backport upstream patch + * Thu May 9 2024 yanshuai - 8:2.03.21-9 - cov: fix memleak in vgchange -- Gitee