aboutsummaryrefslogtreecommitdiffstats
path: root/udev
diff options
context:
space:
mode:
authorBrian Behlendorf <behlendorf1@llnl.gov>2013-01-29 10:53:19 -0800
committerBrian Behlendorf <behlendorf1@llnl.gov>2013-01-29 12:23:17 -0800
commitdbf763b39b232996f0d6bb0022e4446643c18e05 (patch)
treea7c53dccf053df26b2bfa8144ab845680fd87ad2 /udev
parent79c6e4c44538414340a43c065f850d11cb0203af (diff)
Retire zpool_id infrastructure
In the interest of maintaining only one udev helper to give vdevs user friendly names, the zpool_id and zpool_layout infrastructure is being retired. They are superseded by vdev_id which incorporates all the previous functionality. Documentation for the new vdev_id(8) helper and its configuration file, vdev_id.conf(5), can be found in their respective man pages. Several useful example files are installed under /etc/zfs/. /etc/zfs/vdev_id.conf.alias.example /etc/zfs/vdev_id.conf.multipath.example /etc/zfs/vdev_id.conf.sas_direct.example /etc/zfs/vdev_id.conf.sas_switch.example Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #981
Diffstat (limited to 'udev')
-rw-r--r--udev/rules.d/60-zpool.rules.in9
-rw-r--r--udev/rules.d/Makefile.am2
2 files changed, 0 insertions, 11 deletions
diff --git a/udev/rules.d/60-zpool.rules.in b/udev/rules.d/60-zpool.rules.in
deleted file mode 100644
index 54b9fcdeb..000000000
--- a/udev/rules.d/60-zpool.rules.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# @udevdir@/rules.d/60-zpool.rules
-#
-
-ENV{DEVTYPE}=="disk", IMPORT{program}="@udevdir@/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{DEVTYPE}=="partition", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}-part%n"
-KERNEL=="dm-[0-9]*", ENV{SUBSYSTEM}=="block", ENV{ID_ZPOOL}=="?*", SYMLINK+="$env{ID_ZPOOL_PATH}"
diff --git a/udev/rules.d/Makefile.am b/udev/rules.d/Makefile.am
index 1ec83ac76..6816addb4 100644
--- a/udev/rules.d/Makefile.am
+++ b/udev/rules.d/Makefile.am
@@ -1,12 +1,10 @@
udevrule_DATA = \
$(top_srcdir)/udev/rules.d/69-vdev.rules \
- $(top_srcdir)/udev/rules.d/60-zpool.rules \
$(top_srcdir)/udev/rules.d/60-zvol.rules \
$(top_srcdir)/udev/rules.d/90-zfs.rules
EXTRA_DIST = \
$(top_srcdir)/udev/rules.d/69-vdev.rules.in \
- $(top_srcdir)/udev/rules.d/60-zpool.rules.in \
$(top_srcdir)/udev/rules.d/60-zvol.rules.in \
$(top_srcdir)/udev/rules.d/90-zfs.rules.in