diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2013-10-14 15:42:58 +0400 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2013-10-14 15:42:58 +0400 |
commit | 4b8076c851018afdd46a93aff38fde8f0530efb5 (patch) | |
tree | 3335cab0f0631b9a08d9d77c8e51f72f1b7b848b /debian/patches | |
parent | 5cc2ac8025fb9734893c481f5ba5c2fa0e97526d (diff) |
do not use builtin blkid in udev rules
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | debian/patches/use-external-blkid.diff | 16 |
2 files changed, 17 insertions, 0 deletions
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}" + |