===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openbsd/fw_update/fw_install.sh	2021/10/14 02:39:43	1.6
+++ openbsd/fw_update/fw_install.sh	2021/10/14 03:00:02	1.7
@@ -60,14 +60,16 @@
 	do_as _file "$@"
 }
 
-set -A _KERNV -- $( scan_dmesg '/^OpenBSD \([1-9][0-9]*\.[0-9]\)\([^ ]*\) .*/ { s//\1 \2/p; q; }' )
-VNAME=${_KERNV[0]}
-OSDIR=$VNAME
-if ((${#_KERNV[*]} > 1)) && [ "$_KERNV[1]" = "-current" -o "$_KERNV[1]" = "-beta" ]; then
-	OSDIR=snapshots
-fi
+VNAME=$(sysctl -n kern.osrelease)
+VERSION="${VNAME%.*}${VNAME#*.}"
+FWDIR="$VNAME"
 
-FWURL=http://firmware.openbsd.org/firmware/${OSDIR}
+HTTP_FWDIR=$FWDIR
+set -- $(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p")
+[[ $1 == -!(stable) ]] && HTTP_FWDIR=snapshots
+
+FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
+FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 PKGDIR=${DESTDIR}/var/db/pkg
 PATTERNS="file:${0%/*}/firmware_patterns"