X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2Fsuse%2F64-device-mapper.rules;h=36ac7566d3fb66e3e8b800e6eadf5e9ca54fe8f2;hp=bc5d7ea629dda195456c953027adf19f69eb2ec7;hb=9a6741ba2f5ef72c051b11484daabd56213742c0;hpb=198882e9ae1dc65bbca3c00fa67a711c80f3a89c

diff --git a/rules/suse/64-device-mapper.rules b/rules/suse/64-device-mapper.rules
index bc5d7ea62..36ac7566d 100644
--- a/rules/suse/64-device-mapper.rules
+++ b/rules/suse/64-device-mapper.rules
@@ -1,6 +1,6 @@
 # do not edit this file, it will be overwritten on update
 
-KERNEL=="device-mapper", SYMLINK+="mapper/control"
+KERNEL=="device-mapper", NAME="mapper/control"
 
 KERNEL!="dm-*", GOTO="device_mapper_end"
 ACTION!="add|change", GOTO="device_mapper_end"
@@ -14,8 +14,9 @@ ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="strin
 ENV{DM_STATE}=="SUSPENDED", GOTO="device_mapper_end"
 ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
 
-IMPORT{program}="vol_id --export $tempnode"
+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
 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}"