diff options
| author | Michael Tokarev <mjt@tls.msk.ru> | 2014-12-20 08:48:44 +0000 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-12-20 08:48:44 +0000 |
| commit | 489bea7ee8e1dbecfa517b8415568044ab57c73a (patch) | |
| tree | 44d4878d4c7da3f4908ea9a765ef9b8f9c141756 /debian/patches/use-external-blkid.diff | |
mdadm (3.3.2-5) unstable; urgency=medium
* use-tempnode-not-devnode.patch: change udev rules file to use
$tempnode which works both on wheezy and jessie udev, instead
of $devnode which only works in jessie. At this stage it is
better to make rules file compatible with old version instead
of adding versioned dependency. Should be removed for jessie+1.
(Closes: #770883)
* fix Closes: list in previous entry (Closes: #771852)
# imported from the archive
Diffstat (limited to 'debian/patches/use-external-blkid.diff')
| -rw-r--r-- | debian/patches/use-external-blkid.diff | 16 |
1 files changed, 16 insertions, 0 deletions
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}" + |