===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openbsd/fw_update/fw_install.sh	2021/10/17 03:07:48	1.11
+++ openbsd/fw_update/fw_install.sh	2021/10/17 20:29:01	1.12
@@ -91,7 +91,7 @@
 
 fw_update() {
 	local _tmpsrc _f _remove _r
-	local _src=$FWURL _t=Get _cfile="$_tmpsrc/SHA256" _srclocal=false
+	local _src=$FWURL _t=Get _cfile="/tmp/SHA256" _srclocal=false
 	local _drivers=$(
 		last=''
 		ftp -D "Detecting" -Vmo- $PATTERNS |
@@ -122,8 +122,6 @@
 	[[ ! -d $_tmpsrc ]] &&
 		_issue="Cannot create prefetch area" && fail
 
-	cd "$_tmpsrc"
-
 	! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" &&
 	    _issue="Cannot fetch SHA256.sig" && fail
 
@@ -202,9 +200,9 @@
         # TODO: Add some details about the install to +CONTENTS like pkg_add
         # TODO: Or, maybe we save the firmware someplace and make pkg_add reinstall
 		echo "Installing $_f"
-		tar -zxphf "$_f" -C /etc "firmware/*"
+		tar -zxphf "$_tmpsrc/$_f" -C /etc "firmware/*"
 		mkdir -p ${PKGDIR}/${_f%.tgz}/
-		tar -zxphf "$_f" -C "${PKGDIR}/${_f%.tgz}" "+*"
+		tar -zxphf "$_tmpsrc/$_f" -C "${PKGDIR}/${_f%.tgz}" "+*"
 		ed -s "${PKGDIR}/${_f%.tgz}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation