Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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.
This commit is contained in:
Darik Horn 2011-06-17 10:02:36 -05:00 committed by Brian Behlendorf
parent e130330a87
commit b9f27ee765
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -60,8 +60,6 @@ AC_CONFIG_FILES([
etc/Makefile etc/Makefile
etc/udev/Makefile etc/udev/Makefile
etc/udev/rules.d/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/init.d/Makefile
etc/zfs/Makefile etc/zfs/Makefile
man/Makefile man/Makefile

2
etc/udev/rules.d/60-zpool.rules.in
View File

@ -2,7 +2,7 @@
# /etc/udev/rules.d/60-zpool.rules # /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}"
KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}-part%n" KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}-part%n"

2
etc/udev/rules.d/60-zvol.rules.in
View File

@ -3,4 +3,4 @@
# persistent disk links: /dev/zvol/dataset_name # persistent disk links: /dev/zvol/dataset_name
# also creates compatibilty symlink of /dev/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"

7
etc/udev/rules.d/Makefile.am
View File

@ -4,7 +4,12 @@ pkgsysconf_DATA = \
60-zpool.rules \ 60-zpool.rules \
60-zvol.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:: distclean-local::
-$(RM) $(pkgsysconf_DATA) -$(RM) $(pkgsysconf_DATA)