===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.30
retrieving revision 1.33
diff -u -r1.30 -r1.33
--- openbsd/fw_update/fw_install.sh	2021/11/18 02:15:34	1.30
+++ openbsd/fw_update/fw_install.sh	2021/11/19 03:13:11	1.33
@@ -5,8 +5,6 @@
 prefetcharea_fs_list() {
 	echo "${DESTDIR}/tmp"
 }
-reset_watchdog() {
-}
 
 # tmpdir, do_as, unpriv, and unpriv2 are from install.sub
 
@@ -65,16 +63,9 @@
 	do_as _file "$@"
 }
 
-# "fail" needs to be replaced with the "ask_yn" loop like in the installer.
-_issue=
-fail() {
-	echo $_issue >&2
-	exit 1
-}
-
-VNAME=$(sysctl -n kern.osrelease)
-VERSION="${VNAME%.*}${VNAME#*.}"
-FWDIR="$VNAME"
+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
@@ -162,7 +153,6 @@
 	    echo "Signature check of SHA256.sig failed" >&2 && return 1
 
 	for _d in $_drivers; do
-		$UU && reset_watchdog
 		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )
 		_installed=$(
 	        for fw in "${_pkgdir}/$_d-firmware"*; do