Fix hard coded path in 60-vdev.rules.in

The udev data directory was hard coded in 60-vdev.rules.in. That causes
a problem when a distribution changes the location of the directory.
This was not an issue in the past because virtually all distributions
used the same path, but that is beginning to change following a decision
by the systemd developers to change the directory location to reflect
their take-over of udev maintainership. The testing branch of Gentoo
Linux adopted this change, which enabled the hardcoded directory
location to trigger a regression.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1085

diff --git a/udev/rules.d/60-vdev.rules.in b/udev/rules.d/60-vdev.rules.in
index a1885d96771edac3992b6ceec306f61fb30e8798..e47b5aa7cfacb0deb632a7ef56d26cf4c08cc9b2 100644 (file)
--- a/udev/rules.d/60-vdev.rules.in
+++ b/udev/rules.d/60-vdev.rules.in
@@ -1,8 +1,8 @@
 #
-# /lib/udev/rules.d/60-vdev.rules
+# @udevdir@/rules.d/60-vdev.rules
 #
 
-ENV{DEVTYPE}=="disk", IMPORT{program}="/lib/udev/vdev_id -d %k"
+ENV{DEVTYPE}=="disk", IMPORT{program}="@udevdir@/vdev_id -d %k"
 
 KERNEL=="*[!0-9]", ENV{SUBSYSTEM}=="block", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}"
 KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="partition", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}-part%n"

diff --git a/udev/rules.d/60-zpool.rules.in b/udev/rules.d/60-zpool.rules.in
index 32fceed116da9346a1abf412f0b7a1bc1ce8f291..54b9fcdebf1f92f9b0bf7320303c4c9f36f713c8 100644 (file)
--- a/udev/rules.d/60-zpool.rules.in
+++ b/udev/rules.d/60-zpool.rules.in
@@ -1,5 +1,5 @@
 #
-# /lib/udev/rules.d/60-zpool.rules
+# @udevdir@/rules.d/60-zpool.rules
 #
 
 ENV{DEVTYPE}=="disk", IMPORT{program}="@udevdir@/zpool_id -d %p"