=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- openbsd/fw_update/fw_install.sh 2021/12/02 03:44:19 1.45 +++ openbsd/fw_update/fw_install.sh 2021/12/02 03:46:50 1.46 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.45 2021/12/02 03:44:19 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.46 2021/12/02 03:46:50 afresh1 Exp $ set -e # Copyright (c) 2021 Andrew Hewus Fresh @@ -21,7 +21,7 @@ echo "${DESTDIR}/tmp" } -# tmpdir, do_as, unpriv, and unpriv2 are from install.sub +# tmpdir, do_as, and unpriv are from install.sub # modified to use su(1) when not in the installer. # modified to use mktemp(1) when not in the installer. @@ -89,10 +89,6 @@ do_as _sndio "$@" } -unpriv2() { - do_as _file "$@" -} - VNAME=${VNAME:-$(sysctl -n kern.osrelease)} VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"} FWDIR=${FWDIR:-$VNAME} @@ -201,8 +197,8 @@ # sha256. Create a flag file in case ftp failed. Firmware # from net is written to the prefetch area. ( $_unpriv ftp -D "$_t" -Vmo - "$_src/$_f" || >/tmp/fail ) | - ( $_srclocal && unpriv2 sha256 -b >/tmp/h || - unpriv2 -f /tmp/h sha256 -bph /tmp/h >"$_tmpsrc/$_f" ) + ( $_srclocal && sha256 -b >/tmp/h || + sha256 -bph /tmp/h >"$_tmpsrc/$_f" ) # Handle failed transfer. if [[ -f /tmp/fail ]]; then