forked from openzfs/zfs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 openzfs#283.
- Loading branch information
1 parent
e130330
commit b9f27ee
Showing
4 changed files
with
8 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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' '[email protected]' >'$@' | ||
|
||
distclean-local:: | ||
-$(RM) $(pkgsysconf_DATA) |