From 2af96a5df53cfc281dc5c5f72eac5bb2b1739733 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Mon, 12 Nov 2012 12:34:45 -0500 Subject: [PATCH] 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 Signed-off-by: Brian Behlendorf Closes #1085 --- udev/rules.d/60-vdev.rules.in | 4 ++-- udev/rules.d/60-zpool.rules.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/udev/rules.d/60-vdev.rules.in b/udev/rules.d/60-vdev.rules.in index a1885d967..e47b5aa7c 100644 --- 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 32fceed11..54b9fcdeb 100644 --- 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"