From ca5fa3b7b81dfeb8eb7972eb79a07d93d767aa8d Mon Sep 17 00:00:00 2001 From: Zhiqiang Liu Date: Sun, 30 Jan 2022 11:20:19 +0800 Subject: [PATCH] lvm2: check DM_NAME before creating symlink in 13-dm-disk.rules check DM_NAME before creating symlink in 13-dm-disk.rules. Fix issue: https://gitee.com/src-openeuler/lvm2/issues/I4RZLO Signed-off-by: Zhiqiang Liu (cherry picked from commit dea4fb1f9ce5f5fd44d12274189dcdd67bdf6434) --- ...-check-DM_NAME-before-create-symlink.patch | 31 +++++++++++++++++++ lvm2.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0015-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch diff --git a/0015-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch b/0015-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch new file mode 100644 index 0000000..2fb79ac --- /dev/null +++ b/0015-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch @@ -0,0 +1,31 @@ +From cec542e471201e5cd82667a3ec39dc75441d65eb Mon Sep 17 00:00:00 2001 +From: Zhiqiang Liu +Date: Sun, 30 Jan 2022 11:14:01 +0800 +Subject: [PATCH] 13-dm-disk.rules: check DM_NAME before create symlink + +It is necessary to determin whether DM_NAME is NULL before +generating the symlink, otherwise the symlink systemd cannot +be deleted automatically, and there will be left. + +Signed-off-by: wuguagnhao +Signed-off-by: Zhiqiang Liu +--- + udev/13-dm-disk.rules.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/udev/13-dm-disk.rules.in b/udev/13-dm-disk.rules.in +index 5355810..fcb2f37 100644 +--- a/udev/13-dm-disk.rules.in ++++ b/udev/13-dm-disk.rules.in +@@ -14,7 +14,7 @@ ACTION!="add|change", GOTO="dm_end" + ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_end" + ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_end" + +-SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" ++ENV{DM_NAME}=="?*", SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" + ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}" + + ENV{DM_SUSPENDED}=="1", GOTO="dm_end" +-- +1.8.3.1 + diff --git a/lvm2.spec b/lvm2.spec index 0c8b17d..b0d2fff 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -43,7 +43,7 @@ Name: lvm2 Version: 2.03.09 -Release: 9 +Release: 10 Epoch: 8 Summary: Tools for logical volume management License: GPLv2+ and LGPLv2.1 and BSD @@ -63,6 +63,7 @@ Patch11: 0011-enhancement-log-it-when-disk-slow.patch Patch12: 0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch Patch13: 0013-lvreduce-support-yes.patch Patch14: 0014-unit-test-modify-for-systems-with-PGSIZE-of-64K.patch +Patch15: 0015-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -488,6 +489,9 @@ fi %changelog +* Sun Jan 30 2022 Zhiqiang Liu - 8.2.03.09-10 +- check DM_NAME before creating symlink in 13-dm-disk.rules + * Sun Jan 30 2022 Zhiqiang Liu - 8.2.03.09-9 - sync each 20.03 LTS branches