martin f. krafft: import patch from Md

[Martin F. Krafft]

Module: mdadm
Branch: fixes/udev-blkid
Commit: f7d5444e9fe2d7cbcc6c21297a4edd87cc16a37c
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=f7d5444e9fe2d7cbcc6c21297a4edd87cc16a37c

Author: martin f. krafft <madduck at debian.org>
Date:   Tue Oct 27 16:56:12 2009 +0100

import patch from Md

---

 .topdeps           |    1 +
 .topmsg            |   13 +++++++++++++
 udev-md-raid.rules |    2 +-
 3 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/.topdeps b/.topdeps
new file mode 100644
index 0000000..0459513
--- /dev/null
+++ b/.topdeps
@@ -0,0 +1 @@
+upstream
diff --git a/.topmsg b/.topmsg
new file mode 100644
index 0000000..f4888a3
--- /dev/null
+++ b/.topmsg
@@ -0,0 +1,13 @@
+From: martin f. krafft <madduck at debian.org>
+Subject: Use blkid instead of vol_id in udev rules
+
+vol_id was removed by the udev upstream maintainer in May 2009.
+
+One should use
+  /sbin/blkid -o udev -p ...
+(from util-linux >> 2.16) instead of
+  vol_id --export ...
+
+Author: Marco d'Itri <md at linux.it>
+Bug-Debian: http://bugs.debian.org/541884
+Reviewed-by: martin f. krafft <madduck at debian.org>
diff --git a/udev-md-raid.rules b/udev-md-raid.rules
index 300a754..c9a4f0e 100644
--- a/udev-md-raid.rules
+++ b/udev-md-raid.rules
@@ -30,7 +30,7 @@ ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env
 ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
 ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
 
-IMPORT{program}="vol_id --export $tempnode"
+IMPORT{program}="/sbin/blkid -o udev -p $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}"
 ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"