r736 - in lvm2/trunk/debian: . tree/dmsetup/lib/udev/rules.d

[Bastian Blank]

Author: waldi
Date: Wed Sep 30 03:11:00 2009
New Revision: 736

Log:
* debian/changelog: Update.
* debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules
  - Hide symlinks on request.
  - Remove link priority setup for layers.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Wed Sep 30 02:58:41 2009	(r735)
+++ lvm2/trunk/debian/changelog	Wed Sep 30 03:11:00 2009	(r736)
@@ -3,6 +3,7 @@
   * New upstream version.
   * Make dmsetup conflicts against devicekit-disks, it duplicates the udev
     rules.
+  * Add possibility to hide creation of extra symlinks via udev.
 
  -- Bastian Blank <waldi at debian.org>  Wed, 30 Sep 2009 04:49:40 +0200
 

Modified: lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules
==============================================================================
--- lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules	Wed Sep 30 02:58:41 2009	(r735)
+++ lvm2/trunk/debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules	Wed Sep 30 03:11:00 2009	(r736)
@@ -20,11 +20,12 @@
 ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
 
 ENV{DM_SUSPENDED}=="1", GOTO="persistent_storage_dm_end"
+ENV{DM_HIDE}=="1", GOTO="persistent_storage_dm_end"
 
-IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
 OPTIONS="link_priority=-100"
 ENV{DM_UUID}=="DMRAID-*", OPTIONS="link_priority=100"
-ENV{DM_LV_LAYER}=="?*", OPTIONS="link_priority=-90"
+
+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
 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}"