f1a960eb91
- lvm2.spec: merge rules for device-mapper and lvm2-clvm packages, so there is only one spec file and all packages are built consistently. OBS-URL: https://build.opensuse.org/request/show/138672 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=47
41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
---
|
|
udev/10-dm.rules.in | 4 ++++
|
|
udev/13-dm-disk.rules.in | 9 ++++++---
|
|
2 files changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
--- LVM2.2.02.98.orig/udev/10-dm.rules.in
|
|
+++ LVM2.2.02.98/udev/10-dm.rules.in
|
|
@@ -90,6 +90,10 @@ TEST=="dm", ENV{DM_NAME}="$attr{dm/name}
|
|
TEST!="dm", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o name,uuid,suspended"
|
|
ENV{DM_SUSPENDED}!="?*", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o suspended"
|
|
|
|
+# dmsetup export is a SUSE extension to dmsetup
|
|
+# it is required by some other udev rules in SUSE distro.
|
|
+IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup export -j %M -m %m"
|
|
+
|
|
# dmsetup tool provides suspended state information in textual
|
|
# form with values "Suspended"/"Active". We translate it to
|
|
# 0/1 respectively to be consistent with sysfs values.
|
|
--- LVM2.2.02.98.orig/udev/13-dm-disk.rules.in
|
|
+++ LVM2.2.02.98/udev/13-dm-disk.rules.in
|
|
@@ -14,13 +14,16 @@ 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_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
|
|
+SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}", OPTIONS+="string_escape=replace"
|
|
+ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="string_escape=replace"
|
|
|
|
ENV{DM_SUSPENDED}=="1", GOTO="dm_end"
|
|
+ENV{DM_TARGET_TYPES}=="|*error*", GOTO="dm_end"
|
|
|
|
(BLKID_RULE)
|
|
-ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS="link_priority=-100"
|
|
+ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", OPTIONS+="link_priority=-100"
|
|
+OPTIONS+="watch"
|
|
+ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90"
|
|
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}"
|
|
|