From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 29 May 2007 19:25:21 +0000 (+0200)
Subject: rules: SUSE update
X-Git-Tag: 174~1925
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=31a828683457e1639e51affd6507918a9dfe021f

rules: SUSE update
---

diff --git a/etc/udev/suse/64-device-mapper.rules b/etc/udev/suse/64-device-mapper.rules
index 567772ab7..838b02259 100644
--- a/etc/udev/suse/64-device-mapper.rules
+++ b/etc/udev/suse/64-device-mapper.rules
@@ -6,14 +6,14 @@ KERNEL=="device-mapper", SYMLINK+="mapper/control"
 KERNEL!="dm-*", GOTO="device_mapper_end"
 ACTION!="add|change", GOTO="device_mapper_end"
 
-# skip snapshot and error tables
 IMPORT{program}="/sbin/dmsetup export -j%M -m%m"
-ENV{DM_STATE}!="ACTIVE", GOTO="device_mapper_end"
-ENV{DM_TARGET_TYPES}=="|*snapshot*|*error*", GOTO="device_mapper_end"
+ENV{DM_NAME}!="?*", GOTO="device_mapper_end"
 
 SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"
 ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
 
+ENV{DM_STATE}!="ACTIVE", GOTO="device_mapper_end"
+ENV{DM_TARGET_TYPES}=="|*snapshot*|*error*", GOTO="device_mapper_end"
 IMPORT{program}="vol_id --export $tempnode"
 OPTIONS="link_priority=-100"
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
diff --git a/etc/udev/suse/64-md-raid.rules b/etc/udev/suse/64-md-raid.rules
index 3011a903e..6bbfd126d 100644
--- a/etc/udev/suse/64-md-raid.rules
+++ b/etc/udev/suse/64-md-raid.rules
@@ -6,7 +6,7 @@ ACTION!="add|change", GOTO="md_end"
 
 ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
 
-IMPORT{program}="/sbin/mdadm -D --export $tempnode"
+IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
 ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}"
 ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"