===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- openbsd/fw_update/fw_install.sh	2021/11/11 02:05:56	1.22
+++ openbsd/fw_update/fw_install.sh	2021/11/11 02:33:32	1.23
@@ -234,10 +234,12 @@
 		fi
 
 		# TODO: Should we mark these so real fw_update can -Drepair?
-		echo "Installing $_f"
-		tar -zxphf "$_tmpsrc/$_f" -C "/mnt/etc" "firmware/*"
-		mkdir -p ${_pkgdir}/${_f%.tgz}/
-		tar -zxphf "$_tmpsrc/$_f" -C "${_pkgdir}/${_f%.tgz}" "+*"
+		$_unpriv 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" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation