=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.26 retrieving revision 1.30 diff -u -r1.26 -r1.30 --- openbsd/fw_update/fw_install.sh 2021/11/12 02:38:05 1.26 +++ openbsd/fw_update/fw_install.sh 2021/11/18 02:15:34 1.30 @@ -1,14 +1,9 @@ #!/bin/ksh set -e -scan_dmesg() { - # no bsort for now - sed -n "$1" /var/run/dmesg.boot -} - # 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() { } @@ -80,6 +75,7 @@ VNAME=$(sysctl -n kern.osrelease) VERSION="${VNAME%.*}${VNAME#*.}" FWDIR="$VNAME" +MODE=${MODE:-install} # TODO: We need the firmware for the system we just installed # not the one we booted from. For example: @@ -92,7 +88,7 @@ # Otherwise, the fw_update after first boot will fix it up for us. HTTP_FWDIR=$FWDIR -set -- $(scan_dmesg "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p") +set -- sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" /var/run/dmesg.boot [[ $1 == -!(stable) ]] && HTTP_FWDIR=snapshots FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR} @@ -102,7 +98,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 +210,7 @@ while read c g; do case $c in - @cwd) cwd="/mnt/$g" + @cwd) cwd="${DESTDIR}/$g" ;; @*) continue ;; @@ -239,7 +235,7 @@ # TODO: Should we mark these so real fw_update can -Drepair? ftp -D "Install" -Vmo- "file:$_tmpsrc/$_f" | tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \ - -s ",^firmware,mnt/etc/firmware," \ + -s ",^firmware,${DESTDIR}/etc/firmware," \ -C / -zxphf - "+*" "firmware/*" ed -s "${_pkgdir}/${_f%.tgz}/+CONTENTS" <