===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.18
retrieving revision 1.41
diff -u -r1.18 -r1.41
--- openbsd/fw_update/fw_install.sh	2021/10/18 00:33:07	1.18
+++ openbsd/fw_update/fw_install.sh	2021/12/01 02:30:43	1.41
@@ -1,16 +1,24 @@
 #!/bin/ksh
+#	$OpenBSD: fw_install.sh,v 1.41 2021/12/01 02:30:43 afresh1 Exp $
 set -e
 
-scan_dmesg() {
-	# no bsort for now
-	sed -n "$1" /var/run/dmesg.boot
-}
+# 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.
 
-installed_firmware() {
-	for fw in ${PKGDIR}/$1-firmware*; do
-		[ -e "$fw" ] || continue
-		echo ${fw##*/}
-	done
+# 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
@@ -70,16 +78,10 @@
 	do_as _file "$@"
 }
 
-_issue=
-fail() {
-	echo $_issue >&2
-	exit 1
-}
+VNAME=${VNAME:-$(sysctl -n kern.osrelease)}
+VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"}
+FWDIR=${FWDIR:-$VNAME}
 
-VNAME=$(sysctl -n kern.osrelease)
-VERSION="${VNAME%.*}${VNAME#*.}"
-FWDIR="$VNAME"
-
 # TODO: We need the firmware for the system we just installed
 #       not the one we booted from.  For example:
 #       * booting from a snapshot bsd.rd that thinks it is the 7.0 release
@@ -91,20 +93,22 @@
 #       Otherwise, the fw_update after first boot will fix it up for us.
 
 HTTP_FWDIR=$FWDIR
-set -- $(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p")
+set -- sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" /var/run/dmesg.boot
 [[ $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"
+FWPATTERNS="${DESTDIR}/usr/share/misc/firmware_patterns"
 
-fw_update() {
-	local _tmpsrc _f _r _remove _i _installed
-	local _src=$FWURL _t=Get _cfile="/tmp/SHA256" _srclocal=false
+# TODO: support srclocal installation of firmware somehow
+fw_install() {
+	local _src=$1 _tmpfs_list _tmpfs _tmpsrc \
+		_t=Get _cfile="/tmp/SHA256" _pkgdir=${DESTDIR}/var/db/pkg \
+		_f _r _remove _i _installed
+	local _srclocal=false _unpriv=unpriv
+
 	local _d _drivers=$(
 		last=''
-		ftp -D "Detecting" -Vmo- $PATTERNS |
 		while read _d _m; do
 			grep=grep
 			[ "$last" = "$_d" ] && continue
@@ -113,45 +117,65 @@
 			$grep -q "$_m" /var/run/dmesg.boot || continue
 			echo $_d
 			last=$_d
-		done
+		done < $FWPATTERNS
 	)
 
 	if [ -z "$_drivers" ]; then
-		echo "No devices found which need firmware files to be downloaded." >&2
+		echo "No devices found which need firmware files to be downloaded."
 		return
 	fi
 
-	if _tmpsrc=$( tmpdir "${DESTDIR}/tmp/fw_update" ); then
-		(
-		>$_tmpsrc/t &&
-		$_unpriv cat $_tmpsrc/t
-		) >/dev/null 2>&1 ||
-		    rm -r $_tmpsrc
-	fi
+	! _tmpfs_list=$(prefetcharea_fs_list) &&
+		echo "Cannot determine prefetch area" >&2 && return
 
+	for _tmpfs in $_tmpfs_list; do
+		# Try to clean up from previous runs, assuming
+		# the _tmpfs selection yields the same mount
+		# point.
+		for _tmpsrc in $_tmpfs/firmware.+([0-9]).+([0-9]); do
+			[[ -d $_tmpsrc ]] && rm -r $_tmpsrc
+		done
+
+		# 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
+			(
+			>$_tmpsrc/t &&
+			$_unpriv cat $_tmpsrc/t
+			) >/dev/null 2>&1 && break ||
+				rm -r $_tmpsrc
+		fi
+	done
+
 	[[ ! -d $_tmpsrc ]] &&
-		_issue="Cannot create prefetch area" && fail
+		echo "Cannot create prefetch area" >&2 && return 1
 
 	# Cleanup from previous runs.
 	rm -f $_cfile $_cfile.sig
 
-    _t=Get/Verify
+	_t=Get/Verify
 
 	! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" &&
-	    _issue="Cannot fetch SHA256.sig" && fail
+	    echo "Cannot fetch SHA256.sig" >&2 && return 1
 
 	# Verify signature file with public keys.
-	! unpriv -f "$_cfile" \
+	! $_unpriv -f "$_cfile" \
 	    signify -Vep $FWPUB_KEY -x "$_cfile.sig" -m "$_cfile" &&
-	    _issue="Signature check of SHA256.sig failed" && fail
+	    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" )
-		_installed=$( installed_firmware "$_d" )
+		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" | sed '$!d' )
+		_installed=$(
+	        for fw in "${_pkgdir}/$_d-firmware"*; do
+		        [ -e "$fw" ] || continue
+		        echo ${fw##*/}
+	        done
+		)
 
 		for _i in $_installed; do
 			if [ "$_f" = "$_i.tgz" ]; then
-				echo "Firmware for $_d already installed ($_installed)"
+				echo "$_i already installed"
 				continue 2
 			fi
 		done
@@ -168,24 +192,21 @@
 		# Handle failed transfer.
 		if [[ -f /tmp/fail ]]; then
 			rm -f "$_tmpsrc/$_f"
-			_issue="Fetching of $_f failed!"
-			fail
+			echo "Fetching of $_f failed!" >&2
+			continue
 		fi
 
 		# Verify firmware by comparing its checksum with SHA256.
-		if fgrep -qx "SHA256 ($_f) = $(</tmp/h)" "$_cfile"; then
-			#_unver=$(rmel $_f $_unver)
-			true
-		else
+		if ! fgrep -qx "SHA256 ($_f) = $(</tmp/h)" "$_cfile"; then
 			[[ -d "$_tmpsrc" ]] && rm -rf "$_tmpsrc"
-			_issue="Checksum test for $_f failed."
-			fail
+			echo "Checksum test for $_f failed." >&2
+			continue
 		fi
 
 		# TODO: Check hash for files before deleting
-		if [ "$_installed" ] && [ -e "${PKGDIR}/$_installed/+CONTENTS" ]; then
+		if [ "$_installed" ] && [ -e "${_pkgdir}/$_installed/+CONTENTS" ]; then
 			echo "Uninstalling $_installed"
-			cwd=${PKGDIR}/$_installed
+			cwd=${_pkgdir}/$_installed
 
 			set -A _remove -- "${cwd}/+CONTENTS" "${cwd}"
 
@@ -198,8 +219,10 @@
 				*)  set -A _remove -- "$cwd/$c" "${_remove[@]}"
 				  ;;
 				esac
-			done < "${PKGDIR}/$_installed/+CONTENTS"
+			done < "${_pkgdir}/$_installed/+CONTENTS"
 
+			# We specifically rm -f here because not removing files/dirs
+			# is probably not worth failing over.
 			for _r in "${_remove[@]}" ; do
 				if [ -d "$_r" ]; then
 					# Try hard not to actually remove recursively
@@ -211,13 +234,13 @@
 			done
 		fi
 
-        # TODO: Add some details about the install to +CONTENTS like pkg_add
-        # TODO: Or, maybe we save the firmware someplace and make pkg_add reinstall
-		echo "Installing $_f"
-		tar -zxphf "$_tmpsrc/$_f" -C "${DESTDIR}/etc" "firmware/*"
-		mkdir -p ${PKGDIR}/${_f%.tgz}/
-		tar -zxphf "$_tmpsrc/$_f" -C "${PKGDIR}/${_f%.tgz}" "+*"
-		ed -s "${PKGDIR}/${_f%.tgz}/+CONTENTS" <<EOL
+		# TODO: Should we mark these so real fw_update can -Drepair?
+		ftp -D "Install" -Vmo- "file:$_tmpsrc/$_f" |
+			tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \
+			-s ",^firmware,${DESTDIR}/etc/firmware," \
+			-C / -zxphf - "+*" "firmware/*"
+
+		ed -s "${_pkgdir}/${_f%.tgz}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -228,4 +251,4 @@
 	done
 }
 
-fw_update
+fw_install "$FWURL"