--- trunk/udev/udev-md-raid.rules.magellan	2008/12/22 20:31:37	717
+++ trunk/udev/udev-md-raid.rules.magellan	2009/04/24 14:19:13	760
@@ -1,5 +1,5 @@
 # /etc/udev/rules/64-md-raid.rules:  device naming rules for udev
-# $Header: /root/magellan-cvs/src/udev/udev-md-raid.rules.magellan,v 1.3 2008-12-22 20:31:37 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/udev-md-raid.rules.magellan,v 1.4 2009-04-24 14:19:13 niro Exp $
 #
 # There are a number of modifiers that are allowed to be used in some
 # of the different fields. They provide the following subsitutions:
@@ -26,9 +26,13 @@
 # import data from a raid set
 KERNEL!="md*", GOTO="md_end"
 
+# partitions have no md/{array_state,metadata_version}
+ENV{DEVTYPE}=="partition", GOTO="md_ignore_state"
+
 # container devices have a metadata version of e.g. 'external:ddf' and
 # never leave state 'inactive'
 ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state"
+TEST!="md/array_state", GOTO="md_end"
 ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
 LABEL="md_ignore_state"
 
@@ -43,6 +47,7 @@
 
 IMPORT{program}="vol_id --export $tempnode"
 OPTIONS+="link_priority=100"
+OPTIONS+="watch"
 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}"