X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzpool_id%2Fzpool_id;h=f74504cfb4156878eeebc58cf816a74045fe5047;hb=36391312afdfac5584ca40ef1af7721108ce4c20;hp=c3637847a8387757ed34415d34ed04e4199cde7d;hpb=c9c0d073da561bcbefbdf09c87fc75b227415619;p=zfs.git diff --git a/cmd/zpool_id/zpool_id b/cmd/zpool_id/zpool_id index c363784..f74504c 100755 --- a/cmd/zpool_id/zpool_id +++ b/cmd/zpool_id/zpool_id @@ -2,7 +2,7 @@ CONFIG=${CONFIG:-/etc/zfs/zdev.conf} PATH_ID=${PATH_ID:-/lib/udev/path_id} -AWK=${AWK:-/bin/awk} +AWK=${AWK:-/usr/bin/awk} die() { echo "Error: $*" @@ -47,8 +47,9 @@ eval `${PATH_ID} ${DEVICE}` # configuration file which is of the format . # Lines starting with #'s are treated as comments and ignored. # Exact matches are required, wild cards are not supported, -# and only the first match is returned. -ID_ZPOOL=`${AWK} "/${ID_PATH}\>/ && !/^#/ { print \\$1; exit }" ${CONFIG}` +# and only the first match is returned. Also note the following +# regex pattern only appears to work with gawk, not mawk or awk. +ID_ZPOOL=`${AWK} "/\<${ID_PATH}\>/ && !/^#/ { print \\$1; exit }" ${CONFIG}` [ -z ${ID_ZPOOL} ] && die "Missing ID_ZPOOL for ID_PATH: ${ID_PATH}" if [ ${ID_ZPOOL} ]; then