===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.74
retrieving revision 1.86
diff -u -r1.74 -r1.86
--- openbsd/fw_update/fw_install.sh	2021/12/11 20:57:51	1.74
+++ openbsd/fw_update/fw_install.sh	2021/12/18 22:08:04	1.86
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.74 2021/12/11 20:57:51 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.86 2021/12/18 22:08:04 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -16,6 +16,8 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 set -o errexit -o pipefail -o nounset
+set +o monitor
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 CFILE=SHA256.sig
 DESTDIR=${DESTDIR:-}
@@ -38,7 +40,7 @@
 	local _i=1 _dir
 
 	# If we're not in the installer,
-	# we have mktemp and a more hostile environment
+	# we have mktemp and a more hostile environment.
 	if [ -x /usr/bin/mktemp ]; then
 		_dir=$( mktemp -d "${1}-XXXXXXXXX" )
 	else
@@ -51,20 +53,49 @@
 }
 
 fetch() {
-	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _exit
+	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit
 
-	# If we're not in the installer, we have su(1)
-	# and doas(1) is unlikely to be configured.
+	# If we're not in the installer,
+	# we have su(1) and doas(1) is unlikely to be configured.
+	set -o monitor # make sure ftp gets its own process group
+	(
 	if [ -x /usr/bin/su ]; then
-		/usr/bin/su -s /bin/ksh "$_user" -c \
+		exec /usr/bin/su -s /bin/ksh "$_user" -c \
 		    "/usr/bin/ftp -D 'Get/Verify' -Vm -o- '$_src'" > "$_dst"
-		_exit="$?"
 	else
-		/usr/bin/doas -u "$_user" \
+		exec /usr/bin/doas -u "$_user" \
 		    /usr/bin/ftp -D 'Get/Verify' -Vm -o- "$_src" > "$_dst"
-		_exit="$?"
 	fi
+	) & _pid=$!
+	set +o monitor
 
+	trap "kill -TERM '-$_pid'; exit 1" EXIT INT QUIT ABRT TERM
+
+	SECONDS=0
+	_last=0
+	while kill -0 -"$_pid" 2>/dev/null; do
+		if [[ $SECONDS -gt 12 ]]; then
+			set -- $( ls -ln "$_dst" 2>/dev/null )
+			if [[ $_last -ne $5 ]]; then
+				_last=$5
+				SECONDS=0
+				sleep 1
+			else
+				kill -INT -"$_pid"
+				echo "fetch timed out" >&2
+			fi
+		else
+			sleep 1
+		fi
+	done
+
+	set +o errexit
+	wait "$_pid"
+	_exit=$?
+	set -o errexit
+
+	trap "" EXIT INT QUIT ABRT TERM
+
 	if [ "$_exit" -ne 0 ]; then
 		rm -f "$_dst"
 		echo "Cannot fetch $_src" >&2
@@ -81,23 +112,38 @@
 }
 
 devices_needing_firmware() {
-	local _d _m _grep _dmesgtail _last=''
+	local _d _m _line _dmesgtail _last=''
 
 	# When we're not in the installer, the dmesg.boot can
 	# contain multiple boots, so only look in the last one
-	_dmesgtail=$( sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot )
+	sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot |
+	    grep -e "^[a-z][a-z]*[0-9]" -e " not configured " | { \
+		_m=0
+		set -A _dmesgtail
+		while read -r _line; do
+			_dmesgtail[$_m]="$_line"
+			_m=$(( _m + 1 ))
+		done
 
-	grep -v '^[[:space:]]*#' "$FWPATTERNS" |
-	    while read -r _d _m; do
-		_grep="grep"
-		[ "$_last" = "$_d" ] && continue
-		[ "$_m" ] || _m="^${_d}[0-9][0-9]* at "
-		[ "$_m" = "${_m#^}" ] && _grep="fgrep"
+		grep -v '^[[:space:]]*#' "$FWPATTERNS" |
+		    while read -r _d _m; do
+			[ "$_d" = "$_last" ] && continue
+			[ "$_m" ] || _m="^${_d}[0-9] at "
 
-		echo "$_dmesgtail" | $_grep -q "$_m" || continue
-		echo "$_d"
-		_last="$_d"
-	done
+			if [ "$_m" = "${_m#^}" ]; then
+				_m="*$_m"
+			else
+				_m="${_m#^}"
+			fi
+
+			for _line in "${_dmesgtail[@]}"; do
+				if [[ $_line = ${_m}* ]]; then
+					echo "$_d"
+					_last="$_d"
+				fi
+			done
+		    done
+	}
 }
 
 firmware_filename() {
@@ -173,18 +219,18 @@
 }
 
 usage() {
-	echo "usage: fw_install [-d dir | -L dir] [driver | file [...]]"
+	echo "usage: fw_install [-DL] [driver | file [...]]"
 	exit 2
 }
 
 INSTALL=true
 DOWNLOAD=true
 
-while getopts dL name
+while getopts DL name
 do
        case "$name" in
        # "download only" means local dir and don't install
-       d) LOCALSRC=. INSTALL=false ;;
+       D) LOCALSRC=. INSTALL=false ;;
        L) LOCALSRC=. ;;
        ?) usage 2 ;;
        esac
@@ -196,6 +242,8 @@
 [ "$LOCALSRC" ] && "$INSTALL" && DOWNLOAD=false
 [ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"
 
+CFILE="$LOCALSRC/$CFILE"
+
 set -A devices -- "$@"
 
 [ "${devices[*]:-}" ] ||
@@ -219,7 +267,7 @@
 		f=$( firmware_filename "$d" || true )
 		[ "$f" ] || continue
 		f="$LOCALSRC/$f"
-	elif ! "$INSTALL" && ! grep -q "($f)" "$CFILE" ; then
+	elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then
 		echo "Cannot download local file $f" >&2
 		exit 2
 	fi
@@ -241,12 +289,12 @@
 			verify "$f" || continue
 		# else assume it was verified when downloaded
 		fi
-	elif "$INSTALL" && ! "$DOWNLOAD"; then
-		echo "Cannot install ${f##*/}, not found" >&2
-		continue
-	else
+	elif "$DOWNLOAD"; then
 		fetch  "$f" || continue
 		verify "$f" || continue
+	elif "$INSTALL"; then
+		echo "Cannot install ${f##*/}, not found" >&2
+		continue
 	fi
 
 	"$INSTALL" || continue