===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.67
retrieving revision 1.102
diff -u -r1.67 -r1.102
--- openbsd/fw_update/fw_install.sh	2021/12/11 03:25:09	1.67
+++ openbsd/fw_update/fw_install.sh	2021/12/22 04:43:41	1.102
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.67 2021/12/11 03:25:09 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.102 2021/12/22 04:43:41 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -15,7 +15,9 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-set -o errexit -o pipefail -o nounset
+set -o errexit -o pipefail -o nounset -o noclobber -o noglob
+set +o monitor
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 CFILE=SHA256.sig
 DESTDIR=${DESTDIR:-}
@@ -32,11 +34,16 @@
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 
+VERBOSE=false
+DOWNLOAD=true
+INSTALL=true
+LOCALSRC=
+
 tmpdir() {
 	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
@@ -48,66 +55,86 @@
 	echo "$_dir"
 }
 
-realpath () {
-	if [ -x /usr/bin/realpath ]; then
-		/usr/bin/realpath "$1"
-	elif [ "$1" = "${1%/*}" ]; then
-		echo "${PWD}/$1"
-	else
-		echo "$( cd "${1%/*}" && pwd )/${1##*/}"
-	fi
-}
-
 fetch() {
-	local _file=$1 _user=_file _exit
+	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit _error=''
 
-	# 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
+	(
+	flags=-VM
+	"$VERBOSE" && flags=-vm
 	if [ -x /usr/bin/su ]; then
-		/usr/bin/su -s /bin/ksh "$_user" -c \
-		    "/usr/bin/ftp -D 'Get/Verify' -Vm \
-		        -o- '${FWURL}/${_file}'" > "$_file"
-		_exit="$?"
+		exec /usr/bin/su -s /bin/ksh "$_user" -c \
+		    "/usr/bin/ftp -D 'Get/Verify' $flags -o- '$_src'" > "$_dst"
 	else
-		/usr/bin/doas -u "$_user" \
-		    ftp -D 'Get/Verify' -Vm \
-		        -o- "${FWURL}/${_file}" > "$_file"
-		_exit="$?"
+		exec /usr/bin/doas -u "$_user" \
+		    /usr/bin/ftp -D 'Get/Verify' $flags -o- "$_src" > "$_dst"
 	fi
+	) & _pid=$!
+	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
+		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"
+				_error=" (timed out)"
+			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 "$_file"
-		echo "Cannot fetch $_file" >&2
+		rm -f "$_dst"
+		echo "Cannot fetch $_src$_error" >&2
 		return 1
 	fi
 }
 
 verify() {
 	# On the installer we don't get sha256 -C, so fake it.
-	if ! fgrep -qx "SHA256 ($1) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then
-		echo "Checksum test for $1 failed." >&2
+	if ! fgrep -qx "SHA256 (${1##*/}) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then
+		echo "Checksum test for ${1##*/} failed." >&2
 		return 1
 	fi
 }
 
 devices_needing_firmware() {
-	local _d _m _grep _dmesgtail _last=''
+	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=$( sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot )
+	_dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot |
+	    grep -e "^[a-z][a-z]*[0-9]" -e " not configured " )"
 
 	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"
+		[ "$_d" = "$_last" ] && continue
+		[ "$_m" ]             || _m="${_nl}${_d}[0-9] at "
+		[ "$_m" = "${_m#^}" ] || _m="${_nl}${_m#^}"
 
-		echo "$_dmesgtail" | $_grep -q "$_m" || continue
-		echo "$_d"
-		_last="$_d"
-	done
+		if [[ $_dmesgtail = *$_m* ]]; then
+			echo "$_d"
+			_last="$_d"
+		fi
+	    done
 }
 
 firmware_filename() {
@@ -124,21 +151,26 @@
 }
 
 installed_firmware() {
+	set +o noglob
 	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
-		[ -e "$fw" ] || continue
+		[ -e "$fw/+CONTENTS" ] || continue
 		echo "${fw##*/}"
 	done
+	set -o noglob
 }
 
 add_firmware () {
-	local _f="${1##*/}" _pkgdir="${DESTDIR}/var/db/pkg"
-	ftp -D "Install" -Vmo- "file:${1}" |
-		tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \
-		-s ",^firmware,${DESTDIR}/etc/firmware," \
-		-C / -zxphf - "+*" "firmware/*"
+	local _f="${1##*/}"
+	local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"
+	local flags=-VM
+	"$VERBOSE" && flags=-vm
+	ftp -D "Install" "$flags" -o- "file:${1}" |
+		tar -s ",^\+,${_pkgdir}/+," \
+		    -s ",^firmware,${DESTDIR}/etc/firmware," \
+		    -C / -zxphf - "+*" "firmware/*"
 
 	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_pkgdir}/${_f%.tgz}/+CONTENTS" <<EOL
+	ed -s "${_pkgdir}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -152,7 +184,7 @@
 	local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg"
 
 	# TODO: Check hash for files before deleting
-	echo "Uninstalling $_pkg"
+	"$VERBOSE" && echo "Uninstalling $_pkg"
 	_cwd="${_pkgdir}/$_pkg"
 
 	set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}"
@@ -174,7 +206,9 @@
 		if [ -d "$_r" ]; then
 			# Try hard not to actually remove recursively
 			# without rmdir on the install media.
+			set +o noglob
 			[ "$_r/*" = "$( echo "$_r"/* )" ] && rm -rf "$_r"
+			set -o noglob
 		else
 			rm -f "$_r"
 		fi
@@ -182,104 +216,99 @@
 }
 
 usage() {
-	echo "usage: fw_install [-d dir | -L dir] [driver | file [...]]"
+	echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"
 	exit 2
 }
 
-DOWNLOADDIR=
-LOCALDIR=
-while getopts d:L: name
+OPT_D=
+OPT_L=
+while getopts :DLv name
 do
        case "$name" in
-       d) DOWNLOADDIR=$OPTARG ;;
-       L) LOCALDIR=$OPTARG    ;;
-       ?) usage 2 ;;
+       D) OPT_D=true ;;
+       L) OPT_L=true ;;
+       v) VERBOSE=true ;;
+       ?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;;
        esac
 done
 shift $((OPTIND - 1))
 
-if [[ -n "$DOWNLOADDIR" && -n "$LOCALDIR" ]]; then
-	echo "Cannot use -d and -L" >&2
-	usage 2
+[ "$OPT_D" ] && [ "$OPT_L" ] && usage 1
+
+if [ "$OPT_D" ]; then
+	# "Download only" means local dir and don't install
+	INSTALL=false
+	LOCALSRC=.
+elif [ "$OPT_L" ]; then
+	# "Local" means don't download, install from local dir
+	DOWNLOAD=false
+	LOCALSRC=.
+else
+	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
 fi
 
-set -A devices -- "$@"
+CFILE="$LOCALSRC/$CFILE"
 
-[ "${devices[*]:-}" ] ||
-    set -A devices -- $( devices_needing_firmware )
-
-if [ ! "${devices[*]:-}" ]; then
-	echo "No devices found which need firmware files to be downloaded."
-	exit
+if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then
+	echo "need root privileges" >&2
+	exit 1
 fi
 
-# Have to find the full path to firmware files
-# so we can cd and still find them later.
-i=0
-while (( i < "${#devices[@]}" )); do
-	f="${devices[$i]}"
-	d=$( firmware_devicename "$f" )
-	if [ -e "$f" ]; then
-		if [ "$DOWNLOADDIR" ]; then
-			echo "Cannot download local file $f" >&2
-			exit 2
-		fi
-		devices[$i]="$d:$( realpath "$f" )"
-	fi
-	i=$((i + 1))
-done
+set -A devices -- "$@"
 
-if [ "$DOWNLOADDIR" ]; then
-	if ! cd "$DOWNLOADDIR"; then
-		echo "Unable to use $DOWNLOADDIR, make sure it is a directory"
-		exit 2
-	fi
-elif [ "$LOCALDIR" ]; then
-	if ! cd "$LOCALDIR"; then
-		echo "Unable to use $LOCALDIR, make sure it is a directory"
-		exit 2
-	fi
-else
-	TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )
-	cd "$TMPDIR"
+if [ ! "${devices[*]:-}" ]; then
+	"$VERBOSE" && echo -n "Detecting firmware ..."
+	set -A devices -- $( devices_needing_firmware )
+	"$VERBOSE" &&
+	    { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; }
 fi
 
-if ! [[ -n "$LOCALDIR" && -e "$CFILE" ]]; then
+[ "${devices[*]:-}" ] || exit
+
+if "$DOWNLOAD"; then
 	fetch "$CFILE"
 	! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
 	    echo "Signature check of SHA256.sig failed" >&2 && exit 1
 fi
 
-for d in "${devices[@]}"; do
-	f="${d##*:}"
+for f in "${devices[@]}"; do
+	d="$( firmware_devicename "$f" )"
+
 	if [ "$f" = "$d" ]; then
 		f=$( firmware_filename "$d" || true )
 		[ "$f" ] || continue
-	else
-		d="${d%:*}"
+		f="$LOCALSRC/$f"
+	elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then
+		echo "Cannot download local file $f" >&2
+		exit 2
 	fi
 
 	set -A installed -- $( installed_firmware "$d" )
 
-	if [ ! "$DOWNLOADDIR" ] && [ "${installed[*]:-}" ]; then
+	if "$INSTALL" && [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do
 			if [ "${f##*/}" = "$i.tgz" ]; then
-				echo "$i already installed"
+				"$VERBOSE" && echo "$i already installed"
 				continue 2
 			fi
 		done
 	fi
 
-	if [ ! -e "$f" ]; then
-		[ "$LOCALDIR" ] && echo "Cannot install $f, not found" >&2 && continue
+	if [ -e "$f" ]; then
+		if "$DOWNLOAD"; then
+			"$VERBOSE" && echo "Verify existing ${f##*/}"
+			verify "$f" || continue
+		# else assume it was verified when downloaded
+		fi
+	elif "$DOWNLOAD"; then
 		fetch  "$f" || continue
 		verify "$f" || continue
-	elif [ "$DOWNLOADDIR" ]; then
-		echo "Already have $f"
-		verify "$f" || continue
+	elif "$INSTALL"; then
+		echo "Cannot install ${f##*/}, not found" >&2
+		continue
 	fi
 
-	[ "$DOWNLOADDIR" ] && continue
+	"$INSTALL" || continue
 
 	if [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do