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 <[email protected]>
Closes #981

3 files changed, 9 insertions, 12 deletions

diff --git a/scripts/zpool-config/zpool-raid0.sh b/scripts/zpool-config/zpool-raid0.sh
index aa78b71ed..518aec6b9 100644
--- a/scripts/zpool-config/zpool-raid0.sh
+++ b/scripts/zpool-config/zpool-raid0.sh
@@ -2,10 +2,9 @@
 #
 # Zpool Raid-0 Configuration
 #
-# This script is used to simplify testing with the /dev/disk/zpool/[A-Z][1-n]
-# devices.  It assumes that you have already populated /dev/disk/zpool/ by
-# creating an /etc/zfs/zdev.conf file based on your system design.  You may
-# use the zpool_layout command or manually create your own config file.
+# This script is used to test with the /dev/disk/by-vdev/[A-Z][1-n] devices.
+# It assumes that you have already populated /dev/disk/by-vdev/ by creating
+# an /etc/zfs/vdev_id.conf file based on your system design.
 #
 # You can then use either the zpool-create.sh or the zpios.sh test script to
 # test various Raid-0 configurations by adjusting the following tunables.
diff --git a/scripts/zpool-config/zpool-raid10.sh b/scripts/zpool-config/zpool-raid10.sh
index 8cb1f1548..b9c220f47 100644
--- a/scripts/zpool-config/zpool-raid10.sh
+++ b/scripts/zpool-config/zpool-raid10.sh
@@ -2,10 +2,9 @@
 #
 # Zpool Raid-10 Configuration
 #
-# This script is used to simplify testing with the /dev/disk/zpool/[A-Z][1-n]
-# devices.  It assumes that you have already populated /dev/disk/zpool/ by
-# creating an /etc/zfs/zdev.conf file based on your system design.  You may
-# use the zpool_layout command or manually create your own config file.
+# This script is used to test with the /dev/disk/by-vdev/[A-Z][1-n] devices.
+# It assumes that you have already populated /dev/disk/by-vdev/ by creating
+# an /etc/zfs/vdev_id.conf file based on your system design.
 #
 # You can then use either the zpool-create.sh or the zpios.sh test script to
 # test various Raid-10 configurations by adjusting the following tunables.
diff --git a/scripts/zpool-config/zpool-raidz.sh b/scripts/zpool-config/zpool-raidz.sh
index 4f022666f..027aec3d3 100644
--- a/scripts/zpool-config/zpool-raidz.sh
+++ b/scripts/zpool-config/zpool-raidz.sh
@@ -2,10 +2,9 @@
 #
 # Zpool Raid-Z Configuration
 #
-# This script is used to simplify testing with the /dev/disk/zpool/[A-Z][1-n]
-# devices.  It assumes that you have already populated /dev/disk/zpool/ by
-# creating an /etc/zfs/zdev.conf file based on your system design.  You may
-# use the zpool_layout command or manually create your own config file.
+# This script is used to test with the /dev/disk/by-vdev/[A-Z][1-n] devices.
+# It assumes that you have already populated /dev/disk/by-vdev/ by creating
+# an /etc/zfs/vdev_id.conf file based on your system design.
 #
 # You can then use either the zpool-create.sh or the zpios.sh test script to
 # test various Raid-Z configurations by adjusting the following tunables.