X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fzpool_id%2Fzpool_id;h=bf15dc99116e393e15e5637d1b82a94ca6031764;hb=df83110856950c8e7b16a7e94cdf42b8531b9cc8;hp=c65b1b5f434c922411b88e1ccb3a46dda0ccac48;hpb=db7c1771da2634af4e2a4323759656c7f0afe689;p=zfs.git

diff --git a/cmd/zpool_id/zpool_id b/cmd/zpool_id/zpool_id
index c65b1b5..bf15dc9 100755
--- a/cmd/zpool_id/zpool_id
+++ b/cmd/zpool_id/zpool_id
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 CONFIG="${CONFIG:-/etc/zfs/zdev.conf}"
-AWK="${AWK:-/usr/bin/awk}"
 
 if [ -z "${PATH_ID}" ]; then
 	# The path_id helper became a builtin command in udev 174.
@@ -63,9 +62,19 @@ fi
 # configuration file which is of the format <device id> <key>.
 # 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.  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}"`
+# and only the first match is returned.
+ID_ZPOOL=''
+while read CONFIG_ZPOOL CONFIG_PATH REPLY; do
+	if [ "${CONFIG_ZPOOL}" != "${CONFIG_ZPOOL#\#}" ]; then
+		# Skip comment lines.
+		continue
+	fi
+	if [ "${CONFIG_PATH}" = "${ID_PATH}" ]; then
+		ID_ZPOOL="${CONFIG_ZPOOL}"
+		break
+	fi
+done <"${CONFIG}"
+
 [ -z "${ID_ZPOOL}" ] && die "Missing ID_ZPOOL for ID_PATH: ${ID_PATH}"
 
 if [ -n "${ID_ZPOOL}" ]; then