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

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
This commit is contained in:
Richard Yao 2012-11-12 12:34:45 -05:00 committed by Brian Behlendorf
parent 4c837f0d93
commit 2af96a5df5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
udev/rules.d/60-vdev.rules.in
View File

@ -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{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" KERNEL=="*[0-9]", ENV{SUBSYSTEM}=="block", ENV{DEVTYPE}=="partition", ENV{ID_VDEV}=="?*", SYMLINK+="$env{ID_VDEV_PATH}-part%n"

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

@ -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" ENV{DEVTYPE}=="disk", IMPORT{program}="@udevdir@/zpool_id -d %p"