=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.30 retrieving revision 1.32 diff -u -r1.30 -r1.32 --- openbsd/fw_update/fw_install.sh 2021/11/18 02:15:34 1.30 +++ openbsd/fw_update/fw_install.sh 2021/11/19 03:00:54 1.32 @@ -5,8 +5,6 @@ prefetcharea_fs_list() { echo "${DESTDIR}/tmp" } -reset_watchdog() { -} # tmpdir, do_as, unpriv, and unpriv2 are from install.sub @@ -65,13 +63,6 @@ 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" @@ -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