Call built-in blkid conditionaly (udev version >= 176), call standard blkid

with full path otherwise.

diff --git a/udev/13-dm-disk.rules b/udev/13-dm-disk.rules.in
similarity index 98%
rename from udev/13-dm-disk.rules
rename to udev/13-dm-disk.rules.in
index 1e2d19cb45e7952959411dbdc54f9c4cae1ed35f..1920260afd3c24b9f95e85294b466aed27196f5d 100644 (file)
--- a/udev/13-dm-disk.rules
+++ b/udev/13-dm-disk.rules.in
@@ -19,7 +19,7 @@ ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
 
 ENV{DM_SUSPENDED}=="1", GOTO="dm_end"
 
-IMPORT{program}="blkid"
+(BLKID_RULE)
 ENV{DM_UDEV_LOW_PRIORITY_FLAG}=="1", 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}"

diff --git a/udev/Makefile.in b/udev/Makefile.in
index 11635bbc2963c55218be5a0a4ec0b0e13aeed709..5c5c8410b7b5530f6d0093af3d3267723716e1fd 100644 (file)
--- a/udev/Makefile.in
+++ b/udev/Makefile.in
@@ -19,6 +19,12 @@ DM_RULES=10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
 LVM_RULES=11-dm-lvm.rules
 DM_DIR=$(shell grep "\#define DM_DIR" $(top_srcdir)/libdm/misc/dm-ioctl.h | awk '{print $$3}')
 
+ifeq ("@UDEV_HAS_BUILTIN_BLKID@", "yes")
+       BLKID_RULE=IMPORT{builtin}=\"blkid\"
+else
+       BLKID_RULE=IMPORT{program}=\"\$$env{DM_SBIN_PATH}\/blkid -o udev -p \$$tempnode\"
+endif
+
 CLEAN_TARGETS=10-dm.rules
 
 include $(top_builddir)/make.tmpl
@@ -26,7 +32,7 @@ include $(top_builddir)/make.tmpl
 vpath %.rules $(srcdir)
 
 %.rules: %.rules.in
-       $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" $< >$@
+       $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" $< >$@
 
 %_install: %.rules
        $(INSTALL_DATA) -D $< $(udevdir)/$(<F)