From 9c8254f6f95b2b08e2031b2682a632e0df45cefb Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Sun, 4 Dec 2011 13:10:46 -0600 Subject: [PATCH] Support path_id changes in udev 174. The /lib/udev/path_id helper became a builtin command in the udev 174 release, so test whether path_id is external in the zpool_id script. Signed-off-by: Brian Behlendorf Closes: #429 --- cmd/zpool_id/zpool_id | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/zpool_id/zpool_id b/cmd/zpool_id/zpool_id index 9d2a845..a67beac 100755 --- a/cmd/zpool_id/zpool_id +++ b/cmd/zpool_id/zpool_id @@ -1,9 +1,17 @@ #!/bin/bash CONFIG=${CONFIG:-/etc/zfs/zdev.conf} -PATH_ID=${PATH_ID:-/lib/udev/path_id} AWK=${AWK:-/usr/bin/awk} +if [ -z "${PATH_ID}" ]; then + # The path_id helper became a builtin command in udev 174. + if [ -x '/lib/udev/path_id' ]; then + PATH_ID='/lib/udev/path_id' + else + PATH_ID='udevadm test-builtin path_id' + fi +fi + die() { echo "Error: $*" exit 1 -- 1.8.3.1