Michael Tokarev: do not use builtin blkid in udev rules

[Michael Tokarev]

Module: mdadm
Branch: master
Commit: 4b8076c851018afdd46a93aff38fde8f0530efb5
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=4b8076c851018afdd46a93aff38fde8f0530efb5

Author: Michael Tokarev <mjt at tls.msk.ru>
Date:   Mon Oct 14 15:42:58 2013 +0400

do not use builtin blkid in udev rules

---

 debian/changelog                       |    2 ++
 debian/patches/series                  |    1 +
 debian/patches/use-external-blkid.diff |   16 ++++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e70d0b4..d079856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mdadm (3.3-2) UNRELEASED; urgency=low
 
   * use 63-md-raid-arrays.rules instead of old 64-md-raid.rules
     (Closes: #726237)
+  * do not use builtin blkid in udev rules, as our udev (at least
+    on wheezy) does not have it (use-external-blkid.diff)
 
  -- Michael Tokarev <mjt at tls.msk.ru>  Mon, 14 Oct 2013 15:12:00 +0400
 
diff --git a/debian/patches/series b/debian/patches/series
index d8a2a97..fb9bff8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debian-conffile-location.diff
 debian-no-Werror.diff
 sha1-includes.diff
 remove-bashism-from-makefile.patch
+use-external-blkid.diff
diff --git a/debian/patches/use-external-blkid.diff b/debian/patches/use-external-blkid.diff
new file mode 100644
index 0000000..637f7c3
--- /dev/null
+++ b/debian/patches/use-external-blkid.diff
@@ -0,0 +1,16 @@
+From: Michael Tokarev <mjt at tls.msk.ru>
+Subject: blkid is not udev builtin, use /sbin/blkid
+
+--- a/udev-md-raid-arrays.rules
++++ b/udev-md-raid-arrays.rules
+@@ -26,9 +26,7 @@ ENV{DEVTYPE}=="partition", ENV{MD_UUID}=
+ 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{builtin}="blkid"
+-OPTIONS+="link_priority=100"
+-OPTIONS+="watch"
++IMPORT{program}="/sbin/blkid -o udev -p -u noraid $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}"
+