git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support path_id changes in udev 174.
[zfs.git]
/
cmd
/
zpool_id
/
zpool_id
diff --git
a/cmd/zpool_id/zpool_id
b/cmd/zpool_id/zpool_id
index
9d2a845
..
a67beac
100755
(executable)
--- a/
cmd/zpool_id/zpool_id
+++ b/
cmd/zpool_id/zpool_id
@@
-1,9
+1,17
@@
#!/bin/bash
CONFIG=${CONFIG:-/etc/zfs/zdev.conf}
#!/bin/bash
CONFIG=${CONFIG:-/etc/zfs/zdev.conf}
-PATH_ID=${PATH_ID:-/lib/udev/path_id}
AWK=${AWK:-/usr/bin/awk}
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
die() {
echo "Error: $*"
exit 1