Fix autoconf variable substitution in udev rules.

Change the variable substitution in the udev rule templates
according to the method described in the Autoconf manual;
Chapter 4.7.2: Installation Directory Variables.

The udev rules are improperly generated if the bindir parameter
overrides the prefix parameter during configure. For example:

  # ./configure --prefix=/usr/local --bindir=/opt/zfs/bin

The udev helper is installed as /opt/zfs/bin/zpool_id, but the
corresponding udev rule has a different path:

  # /usr/local/etc/udev/rules.d/60-zpool.rules
  ENV{DEVTYPE}=="disk", IMPORT{program}="/usr/local/bin/zpool_id -d %p"

The @bindir@ variable expands to "${exec_prefix}/bin", so it cannot
be used instead of @prefix@ directly.

This also applies to the zvol_id helper.

Closes #283.

diff --git a/configure.ac b/configure.ac
index b578341b6570eff01afcf366c39cbefef8401e0b..a188fa7979f50eecc2a955ab3fe08e819d49f94c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,8 +60,6 @@ AC_CONFIG_FILES([
        etc/Makefile
        etc/udev/Makefile
        etc/udev/rules.d/Makefile
-       etc/udev/rules.d/60-zpool.rules
-       etc/udev/rules.d/60-zvol.rules
        etc/init.d/Makefile
        etc/zfs/Makefile
        man/Makefile

diff --git a/etc/udev/rules.d/60-zpool.rules.in b/etc/udev/rules.d/60-zpool.rules.in
index fc1a1d1f499a0225ddc76c350c12380e755138e2..6e5a727feff6e1e0689c6a0bf82fdab19ce5f76b 100644 (file)
--- a/etc/udev/rules.d/60-zpool.rules.in
+++ b/etc/udev/rules.d/60-zpool.rules.in
@@ -2,7 +2,7 @@
 # /etc/udev/rules.d/60-zpool.rules
 #
 
-ENV{DEVTYPE}=="disk", IMPORT{program}="@prefix@/bin/zpool_id -d %p"
+ENV{DEVTYPE}=="disk", IMPORT{program}="@bindir@/zpool_id -d %p"
 
 KERNEL=="*[!0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}"
 KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}-part%n"

diff --git a/etc/udev/rules.d/60-zvol.rules.in b/etc/udev/rules.d/60-zvol.rules.in
index 06f5f93e81b677e4c7200284fe0512c42bf9d6aa..e71e5be280169099172ea61cd6bfe0b444a15199 100644 (file)
--- a/etc/udev/rules.d/60-zvol.rules.in
+++ b/etc/udev/rules.d/60-zvol.rules.in
@@ -3,4 +3,4 @@
 # persistent disk links: /dev/zvol/dataset_name
 # also creates compatibilty symlink of /dev/dataset_name
 
-KERNEL=="zd*" SUBSYSTEM=="block" ACTION=="add|change" PROGRAM="@prefix@/bin/zvol_id $tempnode" SYMLINK+="zvol/%c %c"
+KERNEL=="zd*" SUBSYSTEM=="block" ACTION=="add|change" PROGRAM="@bindir@/zvol_id $tempnode" SYMLINK+="zvol/%c %c"

diff --git a/etc/udev/rules.d/Makefile.am b/etc/udev/rules.d/Makefile.am
index 1a7a1e39243b196b672e2957cb21efff93835e4a..9929c45bd255f54bcc76cf4f79a55f0276aa7eb0 100644 (file)
--- a/etc/udev/rules.d/Makefile.am
+++ b/etc/udev/rules.d/Makefile.am
@@ -4,7 +4,12 @@ pkgsysconf_DATA = \
        60-zpool.rules \
        60-zvol.rules
 
-EXTRA_DIST = 60-zpool.rules.in 60-zvol.rules.in
+EXTRA_DIST = \
+       60-zpool.rules.in \
+       60-zvol.rules.in
+
+$(pkgsysconf_DATA):
+       -$(SED) -e 's,@bindir\@,$(bindir),g' '$@.in' >'$@'
 
 distclean-local::
        -$(RM) $(pkgsysconf_DATA)