===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.122
retrieving revision 1.149
diff -u -r1.122 -r1.149
--- openbsd/fw_update/fw_install.sh	2021/12/24 02:36:13	1.122
+++ openbsd/fw_update/fw_install.sh	2022/01/14 04:25:46	1.149
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.122 2021/12/24 02:36:13 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.149 2022/01/14 04:25:46 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -34,17 +34,28 @@
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 
-VERBOSE=false
+DRYRUN=false
+VERBOSE=0
 DELETE=false
 DOWNLOAD=true
 INSTALL=true
 LOCALSRC=
 
+unset FTPPID
+unset FWPKGTMP
+REMOVE_LOCALSRC=false
+cleanup() {
+	set +o errexit # ignore errors from killing ftp
+	[ "${FTPPID:-}" ] && kill -TERM -"$FTPPID" 2>/dev/null
+	[ "${FWPKGTMP:-}" ] && rm -rf "$FWPKGTMP"
+	"$REMOVE_LOCALSRC" && rm -rf "$LOCALSRC"
+}
+trap cleanup EXIT
+
 tmpdir() {
 	local _i=1 _dir
 
-	# If we're not in the installer,
-	# we have mktemp and a more hostile environment.
+	# The installer lacks mktemp(1), do it by hand
 	if [ -x /usr/bin/mktemp ]; then
 		_dir=$( mktemp -d "${1}-XXXXXXXXX" )
 	else
@@ -57,29 +68,29 @@
 }
 
 fetch() {
-	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit _error=''
+	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _exit _error=''
 
-	# If we're not in the installer,
-	# we have su(1) and doas(1) is unlikely to be configured.
+	# The installer uses a limited doas(1) as a tiny su(1)
 	set -o monitor # make sure ftp gets its own process group
 	(
-	flags=-VM
-	"$VERBOSE" && flags=-vm
+	_flags=-vm
+	case "$VERBOSE" in
+		0|1) _flags=-VM ;;
+		  2) _flags=-Vm ;;
+	esac
 	if [ -x /usr/bin/su ]; then
 		exec /usr/bin/su -s /bin/ksh "$_user" -c \
-		    "/usr/bin/ftp -N '${0##/}' -D 'Get/Verify' $flags -o- '$_src'" > "$_dst"
+		    "/usr/bin/ftp -N '${0##/}' -D 'Get/Verify' $_flags -o- '$_src'" > "$_dst"
 	else
 		exec /usr/bin/doas -u "$_user" \
-		    /usr/bin/ftp -N "${0##/}" -D 'Get/Verify' $flags -o- "$_src" > "$_dst"
+		    /usr/bin/ftp -N "${0##/}" -D 'Get/Verify' $_flags -o- "$_src" > "$_dst"
 	fi
-	) & _pid=$!
+	) & FTPPID=$!
 	set +o monitor
 
-	trap "kill -TERM '-$_pid' 2>/dev/null; exit 1" EXIT INT QUIT ABRT TERM
-
 	SECONDS=0
 	_last=0
-	while kill -0 -"$_pid" 2>/dev/null; do
+	while kill -0 -"$FTPPID" 2>/dev/null; do
 		if [[ $SECONDS -gt 12 ]]; then
 			set -- $( ls -ln "$_dst" 2>/dev/null )
 			if [[ $_last -ne $5 ]]; then
@@ -87,7 +98,7 @@
 				SECONDS=0
 				sleep 1
 			else
-				kill -INT -"$_pid"
+				kill -INT -"$FTPPID" 2>/dev/null
 				_error=" (timed out)"
 			fi
 		else
@@ -96,34 +107,52 @@
 	done
 
 	set +o errexit
-	wait "$_pid"
+	wait "$FTPPID"
 	_exit=$?
 	set -o errexit
 
-	trap "" EXIT INT QUIT ABRT TERM
+	unset FTPPID
 
 	if [ "$_exit" -ne 0 ]; then
 		rm -f "$_dst"
 		echo "Cannot fetch $_src$_error" >&2
 		return 1
 	fi
+
+	return 0
 }
 
+fetch_cfile() {
+	if "$DOWNLOAD"; then
+		set +o noclobber # we want to get the latest CFILE
+		fetch "$CFILE" || return 1
+		set -o noclobber
+		! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
+		    echo "Signature check of SHA256.sig failed" >&2 && return 1
+	elif [ ! -e "$CFILE" ]; then
+		echo "${0##*/}: $CFILE: No such file or directory" >&2
+		return 2
+	fi
+
+	return 0
+}
+
 verify() {
-	# On the installer we don't get sha256 -C, so fake it.
+	[ -e "$CFILE" ] || fetch_cfile || return 1
+	# The installer sha256 lacks -C, do it by hand
 	if ! fgrep -qx "SHA256 (${1##*/}) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then
 		echo "Checksum test for ${1##*/} failed." >&2
 		return 1
 	fi
+
+	return 0
 }
 
-devices_needing_firmware() {
+firmware_in_dmesg() {
 	local _d _m _line _dmesgtail _last='' _nl=$( echo )
 
-	# When we're not in the installer, the dmesg.boot can
-	# contain multiple boots, so only look in the last one
-	_dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot |
-	    grep -e "^[a-z][a-z]*[0-9]" -e " not configured " )"
+	# The dmesg can contain multiple boots, only look in the last one
+	_dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot )"
 
 	grep -v '^[[:space:]]*#' "$FWPATTERNS" |
 	    while read -r _d _m; do
@@ -140,6 +169,7 @@
 
 firmware_filename() {
 	local _f
+	[ -e "$CFILE" ] || fetch_cfile || return 1
 	_f="$( sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d' )"
 	! [ "$_f" ] && echo "Unable to find firmware for $1" >&2 && return 1
 	echo "$_f"
@@ -153,7 +183,7 @@
 
 installed_firmware() {
 	local _pre="$1" _match="$2" _post="$3" _firmware
-	set -A _firmware -- $(
+	set -sA _firmware -- $(
 	    set +o noglob
 	    grep -Fxl '@option firmware' \
 		"${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \
@@ -168,25 +198,47 @@
 	done
 }
 
+detect_firmware() {
+	local _devices _last='' _d
+
+	set -sA _devices -- $(
+	    firmware_in_dmesg
+	    for _d in $( installed_firmware '*' '-firmware-' '*' ); do
+		firmware_devicename "$_d"
+	    done
+	)
+
+	[ "${_devices[*]:-}" ] || return 0
+	for _d in "${_devices[@]}"; do
+		[ "$_last" = "$_d" ] && continue
+		echo "$_d"
+		_last="$_d"
+	done
+}
+
 add_firmware () {
-	local _f="${1##*/}" _pkgname
-	local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
-	local flags=-VM
-	"$VERBOSE" && flags=-vm
-	ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" |
-		tar -s ",^\+,${_tmpdir}/+," \
+	local _f="${1##*/}" _m="${2:-Install}" _pkgname
+	FWPKGTMP="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
+	local _flags=-vm
+	case "$VERBOSE" in
+		0|1) _flags=-VM ;;
+		2|3) _flags=-Vm ;;
+	esac
+
+	ftp -N "${0##/}" -D "$_m" "$_flags" -o- "file:${1}" |
+		tar -s ",^\+,${FWPKGTMP}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
 
-	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )"
+	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${FWPKGTMP}/+CONTENTS" )"
 	if [ ! "$_pkgname" ]; then
 		echo "Failed to extract name from $1, partial install" 2>&1
-		rm -rf "$_tmpdir"
+		rm -rf "$FWPKGTMP"
+		unset FWPKGTMP
 		return 1
 	fi
 
-	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_tmpdir}/+CONTENTS" <<EOL
+	ed -s "${FWPKGTMP}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -195,15 +247,16 @@
 w
 EOL
 
-	chmod 755 "$_tmpdir"
-	mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
+	chmod 755 "$FWPKGTMP"
+	mv "$FWPKGTMP" "${DESTDIR}/var/db/pkg/${_pkgname}"
+	unset FWPKGTMP
 }
 
 delete_firmware() {
 	local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg"
 
 	# TODO: Check hash for files before deleting
-	"$VERBOSE" && echo "Uninstalling $_pkg"
+	[ "$VERBOSE" -gt 2 ] && echo -n "Uninstall $_pkg ..."
 	_cwd="${_pkgdir}/$_pkg"
 
 	if [ ! -e "$_cwd/+CONTENTS" ] ||
@@ -225,12 +278,11 @@
 		esac
 	done < "${_pkgdir}/${_pkg}/+CONTENTS"
 
-	# We specifically rm -f here because not removing files/dirs
-	# is probably not worth failing over.
+	# Use rm -f, 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
-			# without rmdir on the install media.
+			# The installer lacks rmdir,
+			# but we only want to remove empty directories.
 			set +o noglob
 			[ "$_r/*" = "$( echo "$_r"/* )" ] && rm -rf "$_r"
 			set -o noglob
@@ -238,32 +290,37 @@
 			rm -f "$_r"
 		fi
 	done
+
+	[ "$VERBOSE" -gt 2 ] && echo " done."
+
+	return 0
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-d | -D] [-av] [-p path] [driver | file ...]"
+	echo "usage: ${0##*/} [-d | -F] [-av] [-p path] [driver | file ...]"
 	exit 2
 }
 
 ALL=false
-OPT_D=
-while getopts :adDp:v name
+OPT_F=
+while getopts :adFnp:v name
 do
-       case "$name" in
-       a) ALL=true ;;
-       d) DELETE=true ;;
-       D) OPT_D=true ;;
-       p) LOCALSRC="$OPTARG" ;;
-       v) VERBOSE=true ;;
-       :)
-	   echo "${0##*/}: option requires an argument -- -$OPTARG" >&2
-	   usage 2
-	   ;;
-       ?)
-	   echo "${0##*/}: unknown option -- -$OPTARG" >&2
-	   usage 2
-	   ;;
-       esac
+	case "$name" in
+	a) ALL=true ;;
+	d) DELETE=true ;;
+	F) OPT_F=true ;;
+	n) DRYRUN=true ;;
+	p) LOCALSRC="$OPTARG" ;;
+	v) VERBOSE=$(( VERBOSE + 1 )) ;;
+	:)
+	    echo "${0##*/}: option requires an argument -- -$OPTARG" >&2
+	    usage 2
+	    ;;
+	?)
+	    echo "${0##*/}: unknown option -- -$OPTARG" >&2
+	    usage 2
+	    ;;
+	esac
 done
 shift $((OPTIND - 1))
 
@@ -280,25 +337,37 @@
 fi
 
 # "Download only" means local dir and don't install
-if [ "$OPT_D" ]; then
+if [ "$OPT_F" ]; then
 	INSTALL=false
 	LOCALSRC="${LOCALSRC:-.}"
+
+	# Always check for latest CFILE and so latest firmware
+	if [ -e "$LOCALSRC/$CFILE" ]; then
+		mv "$LOCALSRC/$CFILE" "$LOCALSRC/$CFILE-OLD"
+		if fetch_cfile; then
+			rm -f "$LOCALSRC/$CFILE-OLD"
+		else
+			mv "$LOCALSRC/$CFILE-OLD" "$LOCALSRC/$CFILE"
+			echo "Using existing $CFILE" >&2
+		fi
+	fi
+elif [ "$LOCALSRC" ]; then
+	DOWNLOAD=false
 fi
 
-[ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
-
-CFILE="$LOCALSRC/$CFILE"
-
 if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
 	echo "need root privileges" >&2
 	exit 1
 fi
 
-set -A devices -- "$@"
+set -sA devices -- "$@"
 
 if "$DELETE"; then
-	[ "$OPT_D" ] && usage 22
+	[ "$OPT_F" ] && usage 22
 
+	# Show the "Uninstalling" message when just deleting not upgrading
+	[ "$VERBOSE" -gt 0 ] && VERBOSE=3
+
 	set -A installed
 	if [ "${devices[*]:-}" ]; then
 		"$ALL" && usage 22
@@ -325,46 +394,46 @@
 	deleted=''
 	if [ "${installed:-}" ]; then
 		for fw in "${installed[@]}"; do
-			delete_firmware "$fw" || continue
+			if "$DRYRUN"; then
+				[ "$VERBOSE" -gt 0 ] && echo "Delete $fw"
+			else
+				delete_firmware "$fw" || continue
+			fi
 			deleted="$deleted,$( firmware_devicename "$fw" )"
 		done
 	fi
 
-	deleted="${deleted:+${deleted#,}}"
+	deleted="${deleted#,}"
 	echo "${0:##*/}: deleted ${deleted:-none}";
 
 	exit
 fi
 
+if [ ! "$LOCALSRC" ]; then
+	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
+	REMOVE_LOCALSRC=true
+fi
+
+CFILE="$LOCALSRC/$CFILE"
+
 if [ "${devices[*]:-}" ]; then
 	"$ALL" && usage 22
 else
-	"$VERBOSE" && echo -n "Detecting firmware ..."
-	set -A devices -- $( devices_needing_firmware )
-	"$VERBOSE" &&
+	[ "$VERBOSE" -gt 1 ] && echo -n "Detect firmware ..."
+	set -sA devices -- $( detect_firmware )
+	[ "$VERBOSE" -gt 1 ] &&
 	    { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; }
 fi
 
 [ "${devices[*]:-}" ] || exit
 
-if "$DOWNLOAD"; then
-	set +o noclobber # we want to get the latest CFILE
-	fetch "$CFILE"
-	set -o noclobber
-	! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
-	    echo "Signature check of SHA256.sig failed" >&2 && exit 1
-elif [ ! -e "$CFILE" ]; then
-	# TODO: We shouldn't need a CFILE if all arguments are files.
-	echo "${0##*/}: $CFILE: No such file or directory" >&2
-	exit 2
-fi
-
 added=''
 updated=''
 kept=''
 for f in "${devices[@]}"; do
 	d="$( firmware_devicename "$f" )"
 
+	verify_existing=true
 	if [ "$f" = "$d" ]; then
 		f=$( firmware_filename "$d" || true )
 		[ "$f" ] || continue
@@ -372,6 +441,9 @@
 	elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then
 		echo "Cannot download local file $f" >&2
 		exit 2
+	else
+		# Don't verify files specified on the command-line
+		verify_existing=false
 	fi
 
 	set -A installed -- $( installed_firmware '' "$d-firmware-" '*' )
@@ -379,24 +451,42 @@
 	if "$INSTALL" && [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do
 			if [ "${f##*/}" = "$i.tgz" ]; then
-				"$VERBOSE" && echo "$i already installed"
+				[ "$VERBOSE" -gt 2 ] && echo "Keep $i"
 				kept="$kept,$d"
 				continue 2
 			fi
 		done
 	fi
 
-	if [ -e "$f" ]; then
-		if "$DOWNLOAD"; then
-			"$VERBOSE" && echo "Verify existing ${f##*/}"
-			verify "$f" || continue
-			"$INSTALL"  || kept="$kept,$d"
-		# else assume it was verified when downloaded
+	if "$verify_existing" && [ -e "$f" ]; then
+		msg="Keep/Verify"
+		"$INSTALL" && msg="Verify"
+		[ "$VERBOSE" -gt 1 ] && ! "$INSTALL" &&
+		    echo "$msg ${f##*/}"
+
+		if "$DRYRUN" || verify "$f"; then
+			"$INSTALL" || kept="$kept,$d"
+		elif "$DOWNLOAD"; then
+			[ "$VERBOSE" -gt 0 ] && echo "Refetching $f"
+			rm -f $f
+		else
+			continue
 		fi
+	fi
+
+	if [ -e "$f" ]; then
+		true # verified above
 	elif "$DOWNLOAD"; then
-		fetch  "$f" || continue
-		verify "$f" || continue
-		"$INSTALL"  || added="$added,$d"
+		if "$DRYRUN"; then
+			[ "$VERBOSE" -gt 0 ] && echo "Get/Verify ${f##*/}"
+		else
+			[ "$VERBOSE" -eq 1 ] && echo -n "Get/Verify ${f##*/} ..."
+			fetch  "$f" &&
+			verify "$f" ||
+			    { [ "$VERBOSE" -eq 1 ] && echo " failed."; continue; }
+			[ "$VERBOSE" -eq 1 ] && ! "$INSTALL" && echo " done."
+		fi
+		"$INSTALL" || added="$added,$d"
 	elif "$INSTALL"; then
 		echo "Cannot install ${f##*/}, not found" >&2
 		continue
@@ -404,19 +494,35 @@
 
 	"$INSTALL" || continue
 
-	removed=false
+	update=''
 	if [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do
-			delete_firmware "$i"
-			removed=true
+			"$DRYRUN" || delete_firmware "$i"
+			update="Update"
 		done
 	fi
 
-	add_firmware "$f"
+	"$DRYRUN" || add_firmware "$f" "$update"
 
-	if "$removed"; then
+	f="${f##*/}"
+	f="${f%.tgz}"
+	if [ "$update" ]; then
+		if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then
+			echo " updated."
+		elif [ "$VERBOSE" -eq 1 ]; then
+			echo "Update $f"
+		elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then
+			echo "Update $f"
+		fi
 		updated="$updated,$d"
 	else
+		if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then
+			echo " installed."
+		elif [ "$VERBOSE" -eq 1 ]; then
+			echo "Install $f"
+		elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then
+			echo "Install $f"
+		fi
 		added="$added,$d"
 	fi
 done