From f43c3ad0c643f714c523e513bdc8585c6d5a4050 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 18 Feb 2017 22:46:29 -0800
Subject: [PATCH] ao-bringup: test-chaoskey needs to use the SerialNumber dmesg
 line

I had a locally hacked kernel which was reporting the serial number
along with the device name. Instead of depending on that, just look
for the regular SerialNumber report which is in all kernel versions

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 ao-bringup/test-chaoskey | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ao-bringup/test-chaoskey b/ao-bringup/test-chaoskey
index b4c8164f..f64b1f84 100755
--- a/ao-bringup/test-chaoskey
+++ b/ao-bringup/test-chaoskey
@@ -12,7 +12,9 @@ case "$#" in
 	serial="--serial $1"
 	;;
     0)
-	snum=`dmesg | grep 'on chaoskey' | tail -1 | sed 's/.*chaoskey \([0-9a-f][0-9a-f]*\) on chaoskey.*/\1/'`
+	snum=`sudo dmesg | awk '/usb.*Product:/ { ck = index($0, "ChaosKey"); }
+		     /usb.*SerialNumber:/ { if (ck) print $5; }' | tail -1`
+
 	case "$snum" in
 	    "")
 		serial=""
-- 
2.30.2