=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- openbsd/fw_update/fw_install.sh 2021/11/12 02:38:05 1.26 +++ openbsd/fw_update/fw_install.sh 2021/11/16 02:40:45 1.27 @@ -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 "${DESTDIR}/tmp" } reset_watchdog() { } @@ -102,7 +102,7 @@ # 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 \ + _t=Get _cfile="/tmp/SHA256" _pkgdir=${DESTDIR}/var/db/pkg \ _f _r _remove _i _installed local _srclocal=false _unpriv=unpriv @@ -214,7 +214,7 @@ while read c g; do case $c in - @cwd) cwd="/mnt/$g" + @cwd) cwd="${DESTDIR}/$g" ;; @*) continue ;;