===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.37
retrieving revision 1.44
diff -u -r1.37 -r1.44
--- openbsd/fw_update/fw_install.sh	2021/12/01 02:04:18	1.37
+++ openbsd/fw_update/fw_install.sh	2021/12/02 03:05:49	1.44
@@ -1,21 +1,46 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.37 2021/12/01 02:04:18 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.44 2021/12/02 03:05:49 afresh1 Exp $
 set -e
 
+# Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 # Fake up some things from install.sub that we don't need to actually do
 prefetcharea_fs_list() {
 	echo "${DESTDIR}/tmp"
 }
 
 # tmpdir, do_as, unpriv, and unpriv2 are from install.sub
+# modified to use su(1) when not in the installer.
+# modified to use mktemp(1) when not in the installer.
 
 # Create a temporary directory based on the supplied directory name prefix.
 tmpdir() {
 	local _i=1 _dir
+	if [[ -z $1 ]]; then
+		echo No tmpdir >&2
+		exit 1
+	fi
 
-	until _dir="${1?}.$_i.$RANDOM" && mkdir -- "$_dir" 2>/dev/null; do
-		((++_i < 10000)) || return 1
-	done
+	if [[ -e /usr/bin/mktemp ]]; then
+		_dir=$(/usr/bin/mktemp -d $1 )
+		chown _sndio "$_dir"
+	else
+		until _dir="${1?}.$_i.$RANDOM" && mkdir -- "$_dir" 2>/dev/null; do
+		    ((++_i < 10000)) || return 1
+		done
+	fi
 	echo "$_dir"
 }
 
@@ -43,7 +68,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
@@ -67,7 +96,6 @@
 VNAME=${VNAME:-$(sysctl -n kern.osrelease)}
 VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"}
 FWDIR=${FWDIR:-$VNAME}
-MODE=${MODE:-install}
 
 # TODO: We need the firmware for the system we just installed
 #       not the one we booted from.  For example:
@@ -94,7 +122,6 @@
 		_f _r _remove _i _installed
 	local _srclocal=false _unpriv=unpriv
 
-	echo "Let's $MODE firmware!"
 	local _d _drivers=$(
 		last=''
 		while read _d _m; do
@@ -127,7 +154,7 @@
 		# Create a download directory for the firmware and
 		# check that the _sndio user can read files from
 		# it. Otherwise cleanup and skip the filesystem.
-		if _tmpsrc=$(tmpdir "$_tmpfs/firmware"); then
+		if _tmpsrc=$(tmpdir "$_tmpfs/firmware-XXXXXXXXX"); then
 			(
 			>$_tmpsrc/t &&
 			$_unpriv cat $_tmpsrc/t
@@ -153,7 +180,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" )
+		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" | sed '$!d' )
 		_installed=$(
 	        for fw in "${_pkgdir}/$_d-firmware"*; do
 		        [ -e "$fw" ] || continue