packages/lvm2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lvm2: check DM_NAME before creating symlink in 13-dm-disk.rules

Browse Source 
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 <liuzhiqiang26@huawei.com>
This commit is contained in:
Zhiqiang Liu 2022-01-30 11:29:36 +08:00
parent 1ac22ee5f4
commit 0cfb6fa80f
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0012-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch Normal file
View File

@ -0,0 +1,31 @@
From cec542e471201e5cd82667a3ec39dc75441d65eb Mon Sep 17 00:00:00 2001
From: Zhiqiang Liu <liuzhiqiang26@huawei.com>
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 <wuguanghao3@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
---
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

6
lvm2.spec
View File

@ -43,7 +43,7 @@
Name: lvm2
Version: 2.03.14
Release: 1
Release: 2
Epoch: 8
Summary: Tools for logical volume management
License: GPLv2+ and LGPLv2.1 and BSD
@ -60,6 +60,7 @@ Patch8: 0008-enhancement-add-dfx-log.patch
Patch9: 0009-enhancement-syslog-more-when-use-libdevmapper-so.patch
Patch10: 0010-enhancement-log-it-when-disk-slow.patch
Patch11: 0011-bugfix-lvm2-fix-the-reuse-of-va_list.patch
Patch12: 0012-13-dm-disk.rules-check-DM_NAME-before-create-symlink.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -486,6 +487,9 @@ fi
%changelog
* Sun Jan 30 2022 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 8.2.03.14-2
- check DM_NAME before creating symlink in 13-dm-disk.rules
* Mon Nov 22 2021 wuguanghao<wuguanghao3@huawei.com> - 8:2.03.14-1
- upgrade to 2.03.14