summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2013-10-14 15:42:58 +0400
committerMichael Tokarev <mjt@tls.msk.ru>2013-10-14 15:42:58 +0400
commit4b8076c851018afdd46a93aff38fde8f0530efb5 (patch)
tree3335cab0f0631b9a08d9d77c8e51f72f1b7b848b /debian
parent5cc2ac8025fb9734893c481f5ba5c2fa0e97526d (diff)
do not use builtin blkid in udev rules
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/use-external-blkid.diff16
3 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e70d0b4a..d079856c 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@tls.msk.ru> Mon, 14 Oct 2013 15:12:00 +0400
diff --git a/debian/patches/series b/debian/patches/series
index d8a2a972..fb9bff85 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 00000000..637f7c3a
--- /dev/null
+++ b/debian/patches/use-external-blkid.diff
@@ -0,0 +1,16 @@
+From: Michael Tokarev <mjt@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}"
+