X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fcommon.sh.in;h=c99894cbff0ee618d03e989477263b7e3248d953;hb=89103a264343b0fed763a4ed0cc331b7233bef0d;hp=531c7983b4f9334ca646cab00f4dd0166627357b;hpb=930b6fec210d828cb3755f8756dbbbf3001cccae;p=zfs.git

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
index 531c798..c99894c 100644
--- a/scripts/common.sh.in
+++ b/scripts/common.sh.in
@@ -41,7 +41,7 @@ udevruledir=@udevruledir@
 sysconfdir=@sysconfdir@
 
 ETCDIR=${ETCDIR:-/etc}
-DEVDIR=${DEVDIR:-/dev/disk/zpool}
+DEVDIR=${DEVDIR:-/dev/disk/by-vdev}
 ZPOOLDIR=${ZPOOLDIR:-${pkglibexecdir}/zpool-config}
 ZPIOSDIR=${ZPIOSDIR:-${pkglibexecdir}/zpios-test}
 ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkglibexecdir}/zpios-profile}
@@ -50,7 +50,6 @@ ZDB=${ZDB:-${sbindir}/zdb}
 ZFS=${ZFS:-${sbindir}/zfs}
 ZINJECT=${ZINJECT:-${sbindir}/zinject}
 ZPOOL=${ZPOOL:-${sbindir}/zpool}
-ZPOOL_ID=${ZPOOL_ID:-${bindir}/zpool_id}
 ZTEST=${ZTEST:-${sbindir}/ztest}
 ZPIOS=${ZPIOS:-${sbindir}/zpios}
 
@@ -371,7 +370,7 @@ format() {
 
 	# Force 4K blocksize, else mkfs.ext2 tries to use 8K, which
 	# won't mount
-	/sbin/mkfs.${FSTYPE} -b 4096 -F -q ${DEVICE} || return 1
+	/sbin/mkfs.${FSTYPE} -b 4096 -F -q ${DEVICE} >/dev/null || return 1
 
 	return 0
 }
@@ -525,7 +524,7 @@ udev_trigger() {
 
 #
 # The following udev helper functions assume that the provided
-# udev rules file will create a /dev/disk/zpool/<CHANNEL><RANK>
+# udev rules file will create a /dev/disk/by-vdev/<CHANNEL><RANK>
 # disk mapping.  In this mapping each CHANNEL is represented by
 # the letters a-z, and the RANK is represented by the numbers
 # 1-n.  A CHANNEL should identify a group of RANKS which are all