===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.25
retrieving revision 1.28
diff -u -r1.25 -r1.28
--- openbsd/fw_update/fw_install.sh	2021/11/11 02:38:32	1.25
+++ openbsd/fw_update/fw_install.sh	2021/11/17 02:37:01	1.28
@@ -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,9 +102,11 @@
 # 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
+
+	echo "Let's $MODE firmware!"
 	local _d _drivers=$(
 		last=''
 		$_unpriv ftp -D "Detecting" -Vmo- $FWPATTERNS |
@@ -212,7 +214,7 @@
 
 			while read c g; do
 				case $c in
-				@cwd) cwd="/mnt/$g"
+				@cwd) cwd="${DESTDIR}/$g"
 				  ;;
 				@*) continue
 				  ;;
@@ -237,7 +239,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" <<EOL