===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.40
retrieving revision 1.42
diff -u -r1.40 -r1.42
--- openbsd/fw_update/fw_install.sh	2021/12/01 02:29:14	1.40
+++ openbsd/fw_update/fw_install.sh	2021/12/01 03:11:43	1.42
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.40 2021/12/01 02:29:14 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.42 2021/12/01 03:11:43 afresh1 Exp $
 set -e
 
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
@@ -57,7 +57,11 @@
 		chown "$_user" "$_file"
 	fi
 
-	doas -u "$_user" "$@"
+	if [[ -x /usr/bin/su ]]; then
+		/usr/bin/su -s /bin/ksh "$_user" -c "$*"
+	else
+		doas -u "$_user" "$@"
+	fi
 	_rc=$?
 
 	while doas -u "$_user" kill -9 -1 2>/dev/null; do
@@ -165,7 +169,7 @@
 	    echo "Signature check of SHA256.sig failed" >&2 && return 1
 
 	for _d in $_drivers; do
-		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" | tail -1 )
+		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" | sed '$!d' )
 		_installed=$(
 	        for fw in "${_pkgdir}/$_d-firmware"*; do
 		        [ -e "$fw" ] || continue