=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- openbsd/fw_update/fw_install.sh 2021/11/11 02:34:00 1.24 +++ openbsd/fw_update/fw_install.sh 2021/11/11 02:38:32 1.25 @@ -8,7 +8,7 @@ # Fake up some things from install.sub that we don't need to actually do prefetcharea_fs_list() { - echo "/mnt/tmp" + echo "/mnt/tmp" } reset_watchdog() { } @@ -102,9 +102,9 @@ # TODO: support srclocal installation of firmware somehow fw_update() { local _src=$1 _tmpfs_list _tmpfs _tmpsrc \ - _t=Get _cfile="/tmp/SHA256" _pkgdir=/mnt/var/db/pkg \ - _f _r _remove _i _installed - local _srclocal=false _unpriv=unpriv + _t=Get _cfile="/tmp/SHA256" _pkgdir=/mnt/var/db/pkg \ + _f _r _remove _i _installed + local _srclocal=false _unpriv=unpriv local _d _drivers=$( last='' $_unpriv ftp -D "Detecting" -Vmo- $FWPATTERNS | @@ -235,11 +235,10 @@ fi # TODO: Should we mark these so real fw_update can -Drepair? - $_unpriv ftp -D "Install" -Vmo- "file:$_tmpsrc/$_f" | - tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \ - -s ",^firmware,mnt/etc/firmware," \ - -C / -zxphf - \ - "+*" "firmware/*" + ftp -D "Install" -Vmo- "file:$_tmpsrc/$_f" | + tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \ + -s ",^firmware,mnt/etc/firmware," \ + -C / -zxphf - "+*" "firmware/*" ed -s "${_pkgdir}/${_f%.tgz}/+CONTENTS" <