From: Matthias Schwarzott <zzam@gentoo.org>
Date: Wed, 9 May 2007 06:25:51 +0000 (+0200)
Subject: rules: Gentoo update
X-Git-Tag: 174~1957
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=564794bbd3758371e5b4fbc745b2c67c50dd4de1;ds=sidebyside

rules: Gentoo update
---

diff --git a/etc/udev/gentoo/64-device-mapper.rules b/etc/udev/gentoo/64-device-mapper.rules
index d2639af5d..e104a175d 100644
--- a/etc/udev/gentoo/64-device-mapper.rules
+++ b/etc/udev/gentoo/64-device-mapper.rules
@@ -9,23 +9,25 @@ ACTION!="add|change", GOTO="device_mapper_end"
 # lookup device name
 # use dmsetup, until devmap_name is provided by sys-fs/device-mapper
 PROGRAM=="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info",
-	ENV{ID_DM_NAME}="%c"
+	ENV{DM_NAME}="%c"
 
 # do not do anything if dmsetup does not provide a name
-ENV{ID_DM_NAME}=="", NAME="", OPTIONS="ignore_device"
+ENV{DM_NAME}=="", NAME="", OPTIONS="ignore_device"
 
 # ignore luks crypt devices while not fully up
-ENV{ID_DM_NAME}=="temporary-cryptsetup-*", NAME="", OPTIONS="ignore_device"
+ENV{DM_NAME}=="temporary-cryptsetup-*", NAME="", OPTIONS="ignore_device"
 
 # use queried name
-ENV{ID_DM_NAME}=="?*", NAME="mapper/$env{ID_DM_NAME}"
+ENV{DM_NAME}=="?*", NAME="mapper/$env{DM_NAME}"
+
+SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"
 
 PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end"
 RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end"
 
 IMPORT{program}="vol_id --export $tempnode"
 OPTIONS="link_priority=50"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_SAFE}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_SAFE}"
 ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
 LABEL="device_mapper_end"